minor: warnings & code cleanup

Arnaud Gourlay · Arnaud Gourlay · commit a0953a131fc7 · 2020-10-09T15:14:04.000+02:00
diff --git a/docs/scala.md b/docs/scala.md
@@ -126,8 +126,8 @@ The `query` method takes an `Expr` object. `Expr` objects can be composed with o
 ```scala
 Value readHippoResults = client.query(
   Select(Value("data"),Get(hippoRef))
-).get();
-System.out.println("Hippo Spells:\n " + readHippoResults + "\n");
+).get()
+println("Hippo Spells:\n " + readHippoResults + "\n")
 ```
 
 The `query` method also accepts a `timeout` parameter. The `timeout` value defines the maximum time a `query` will be allowed to run on the server. If the value is exceeded, the query is aborted. If no `timeout` is defined in scope, a default value is assigned on the server side.
diff --git a/faunadb-common/src/main/java/com/faunadb/common/Connection.java b/faunadb-common/src/main/java/com/faunadb/common/Connection.java
@@ -22,7 +22,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static io.netty.util.CharsetUtil.US_ASCII;
 import static io.netty.util.CharsetUtil.UTF_8;
 import static java.lang.String.format;
 
diff --git a/faunadb-java/src/main/java/com/faunadb/client/errors/FaunaException.java b/faunadb-java/src/main/java/com/faunadb/client/errors/FaunaException.java
@@ -6,7 +6,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * The base type for all FaunaDB exceptions.
diff --git a/faunadb-java/src/main/java/com/faunadb/client/query/Language.java b/faunadb-java/src/main/java/com/faunadb/client/query/Language.java
@@ -7048,7 +7048,7 @@ public static Expr ToMicros(Expr value) {
   /**
    * Returns a time expression's day of the month, from 1 to 31.
    *
-   * @param value an expression. Type: Any
+   * @param expr an expression. Type: Any
    * @return a new {@link Expr}
    */
   public static Expr DayOfMonth(Expr expr) {
@@ -7059,7 +7059,7 @@ public static Expr DayOfMonth(Expr expr) {
    * Returns a time expression's day of the week following ISO-8601 convention,
    * from 1 (Monday) to 7 (Sunday).
    *
-   * @param value an expression. Type: Any
+   * @param expr an expression. Type: Any
    * @return a new {@link Expr}
    */
   public static Expr DayOfWeek(Expr expr) {
@@ -7070,7 +7070,7 @@ public static Expr DayOfWeek(Expr expr) {
    * Returns a time expression's day of the year, from 1 to 365, or 366 in a leap
    * year.
    *
-   * @param value an expression. Type: Any
+   * @param expr an expression. Type: Any
    * @return a new {@link Expr}
    */
   public static Expr DayOfYear(Expr expr) {
@@ -7080,7 +7080,7 @@ public static Expr DayOfYear(Expr expr) {
   /**
    * Returns the time expression's year, following the ISO-8601 standard.
    *
-   * @param value an expression. Type: Any
+   * @param expr an expression. Type: Any
    * @return a new {@link Expr}
    */
   public static Expr Year(Expr expr) {
@@ -7090,7 +7090,7 @@ public static Expr Year(Expr expr) {
   /**
    * Returns a time expression's month of the year, from 1 to 12.
    *
-   * @param value an expression. Type: Any
+   * @param expr an expression. Type: Any
    * @return a new {@link Expr}
    */
   public static Expr Month(Expr expr) {
@@ -7100,7 +7100,7 @@ public static Expr Month(Expr expr) {
   /**
    * Returns a time expression's hour of the day, from 0 to 23.
    *
-   * @param value an expression. Type: Any
+   * @param expr an expression. Type: Any
    * @return a new {@link Expr}
    */
   public static Expr Hour(Expr expr) {
@@ -7110,7 +7110,7 @@ public static Expr Hour(Expr expr) {
   /**
    * Returns a time expression's minute of the hour, from 0 to 59.
    *
-   * @param value an expression. Type: Any
+   * @param expr an expression. Type: Any
    * @return a new {@link Expr}
    */
   public static Expr Minute(Expr expr) {
@@ -7120,7 +7120,7 @@ public static Expr Minute(Expr expr) {
   /**
    * Returns a time expression's second of the minute, from 0 to 59.
    *
-   * @param value an expression. Type: Any
+   * @param expr an expression. Type: Any
    * @return a new {@link Expr}
    */
   public static Expr Second(Expr expr) {
diff --git a/faunadb-java/src/main/java/com/faunadb/client/types/Codec.java b/faunadb-java/src/main/java/com/faunadb/client/types/Codec.java
@@ -2,7 +2,6 @@
 
 import com.faunadb.client.types.Value.*;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
diff --git a/faunadb-java/src/main/java/com/faunadb/client/types/Deserializer.java b/faunadb-java/src/main/java/com/faunadb/client/types/Deserializer.java
@@ -10,7 +10,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Iterator;
 import java.util.List;
diff --git a/faunadb-java/src/main/java/com/faunadb/client/types/Path.java b/faunadb-java/src/main/java/com/faunadb/client/types/Path.java
@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.faunadb.client.types.Codec.ARRAY;
diff --git a/faunadb-java/src/test/java/com/faunadb/client/ClientSpec.java b/faunadb-java/src/test/java/com/faunadb/client/ClientSpec.java
@@ -30,7 +30,6 @@
 import static com.faunadb.client.types.Codec.*;
 import static com.faunadb.client.types.Value.NullV.NULL;
 import static java.lang.String.format;
-import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.Matchers.aMapWithSize;
 import static org.hamcrest.Matchers.containsInAnyOrder;
diff --git a/faunadb-java/src/test/java/com/faunadb/client/DeserializationSpec.java b/faunadb-java/src/test/java/com/faunadb/client/DeserializationSpec.java
@@ -10,7 +10,6 @@
 import org.junit.Test;
 
 import java.io.IOException;
-import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
@@ -19,10 +18,8 @@
 import java.util.Optional;
 
 import static com.faunadb.client.types.Codec.*;
-import static com.faunadb.client.types.Value.RefV;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static java.time.ZoneOffset.UTC;
 import static org.junit.Assert.assertThat;
 
 public class DeserializationSpec {
diff --git a/faunadb-scala/src/load/scala/faunadb/FaunaClientFixture.scala b/faunadb-scala/src/load/scala/faunadb/FaunaClientFixture.scala
@@ -16,7 +16,7 @@ trait FaunaClientFixture extends SuiteMixin with BeforeAndAfterAll { self: fixtu
       val scheme = Option(System.getenv("FAUNA_SCHEME")) getOrElse { "https" }
       val port = Option(System.getenv("FAUNA_PORT")) getOrElse { "443" }
 
-      collection.Map("root_token" -> rootKey, "root_url" -> s"${scheme}://${domain}:${port}")
+      collection.Map("root_token" -> rootKey, "root_url" -> s"$scheme://$domain:$port")
     }
 
     _rootClient = FaunaClient(endpoint = config("root_url"), secret = config("root_token"))
diff --git a/faunadb-scala/src/main/scala/faunadb/FaunaClient.scala b/faunadb-scala/src/main/scala/faunadb/FaunaClient.scala
@@ -22,8 +22,6 @@ import scala.compat.java8.FutureConverters._
 import scala.compat.java8.OptionConverters._
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.{ ExecutionContext, Future }
-import scala.util.{Success, Try}
-import scala.util.control.NonFatal
 
 /** Companion object to the FaunaClient class. */
 object FaunaClient {
diff --git a/faunadb-scala/src/main/scala/faunadb/errors/FaunaException.scala b/faunadb-scala/src/main/scala/faunadb/errors/FaunaException.scala
@@ -35,7 +35,6 @@ case class BadRequestException(response: Option[QueryErrorResponse], message: St
 
 /**
  * An exception thrown if FaunaDB responds with an HTTP 404 for non-query endpoints.
- * @param message
  */
 case class NotFoundException(response: Option[QueryErrorResponse], message: String) extends FaunaException(response, message) {
   def this(message: String) = this(None, message)
diff --git a/faunadb-scala/src/main/scala/faunadb/jackson/ValueDeserializer.scala b/faunadb-scala/src/main/scala/faunadb/jackson/ValueDeserializer.scala
@@ -3,8 +3,6 @@ package faunadb.jackson
 import com.fasterxml.jackson.core.JsonToken._
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind._
-import com.fasterxml.jackson.databind.module.SimpleModule
-import com.fasterxml.jackson.databind.node.ObjectNode
 import faunadb.values._
 
 private[faunadb] class ValueDeserializer extends JsonDeserializer[Value] {
diff --git a/faunadb-scala/src/main/scala/faunadb/query/package.scala b/faunadb-scala/src/main/scala/faunadb/query/package.scala
@@ -81,7 +81,7 @@ package query {
     * Helper for path syntax
     */
   case class Path private (segments: Expr*) extends AnyVal {
-    def /(sub: Path) = Path(segments ++ sub.segments: _*)
+    def /(sub: Path): Path = Path(segments ++ sub.segments: _*)
   }
 
   /**
@@ -103,7 +103,7 @@ package object query {
   // implicit conversions
 
   implicit def strToPath(str: String): Path = Path(Expr(StringV(str)))
-  implicit def intToPath(int: Int): Path = Path(Expr(LongV(int)))
+  implicit def intToPath(int: Int): Path = Path(Expr(LongV(int.toLong)))
   implicit def pathToExpr(path: Path): Expr = Expr(varargs(path.segments))
 
   // Helpers
@@ -216,7 +216,7 @@ package object query {
     *
     * '''Reference''': [[https://app.fauna.com/documentation/reference/queryapi#basic-forms]]
     */
-  def Call(ref: Expr, arguments: Expr*) =
+  def Call(ref: Expr, arguments: Expr*): Expr =
     Expr(ObjectV("call" -> ref.value, "arguments" -> varargs(arguments)))
 
   /**
@@ -235,7 +235,7 @@ package object query {
   def Query(fn: (Expr, Expr, Expr, Expr, Expr, Expr, Expr, Expr, Expr) => Expr): Expr = macro QueryMacros.query
   def Query(fn: (Expr, Expr, Expr, Expr, Expr, Expr, Expr, Expr, Expr, Expr) => Expr): Expr = macro QueryMacros.query
 
-  def Query(lambda: Expr) =
+  def Query(lambda: Expr): Expr =
     Expr(ObjectV("query" -> lambda.value))
 
   /**
diff --git a/faunadb-scala/src/main/scala/faunadb/values/Codec.scala b/faunadb-scala/src/main/scala/faunadb/values/Codec.scala
@@ -191,7 +191,7 @@ object Decoder {
   implicit def MapDecoder[T](implicit decoder: Decoder[T]): Decoder[Map[String, T]] = new Decoder[Map[String, T]] {
     def decode(v: Value, path: FieldPath) =
       v match {
-        case ObjectV(fields) => {
+        case ObjectV(fields) =>
           val successBuilder = Map.newBuilder[String, T]
           val failureBuilder = List.newBuilder[FieldError]
 
@@ -208,7 +208,6 @@ object Decoder {
             VFail(failures)
           else
             VSuccess(successBuilder.result(), path)
-        }
         case _ => Result.Unexpected(v, "Map", path)
       }
   }
@@ -386,27 +385,27 @@ object Encoder {
   }
 
   implicit object CharEncoder extends Encoder[Char] {
-    def encode(t: Char) = LongV(t)
+    def encode(t: Char) = LongV(t.toLong)
   }
 
   implicit object ByteEncoder extends Encoder[Byte] {
-    def encode(t: Byte) = LongV(t)
+    def encode(t: Byte) = LongV(t.toLong)
   }
 
   implicit object ShortEncoder extends Encoder[Short] {
-    def encode(t: Short) = LongV(t)
+    def encode(t: Short) = LongV(t.toLong)
   }
 
   implicit object IntEncoder extends Encoder[Int] {
-    def encode(t: Int) = LongV(t)
+    def encode(t: Int) = LongV(t.toLong)
   }
 
   implicit object LongEncoder extends Encoder[Long] {
     def encode(t: Long) = LongV(t)
   }
 
   implicit object FloatEncoder extends Encoder[Float] {
-    def encode(t: Float) = DoubleV(t)
+    def encode(t: Float) = DoubleV(t.toDouble)
   }
 
   implicit object DoubleEncoder extends Encoder[Double] {
diff --git a/faunadb-scala/src/main/scala/faunadb/values/Field.scala b/faunadb-scala/src/main/scala/faunadb/values/Field.scala
@@ -75,7 +75,7 @@ sealed abstract class Field[T] {
     new TypedField(ev(this), dec)
 
   def collect[U, Col[_]](inner: Field[U])(implicit ev: Field[T] =:= Field[Value], cbf: CanBuildFrom[_, U, Col[U]]): Field[Col[U]] =
-    new CollectionField(ev(this), cbf, inner.get _)
+    new CollectionField(ev(this), cbf, inner.get)
 }
 
 private[values] class SubField(parent: Field[Value], subpath: FieldPath) extends Field[Value] {
diff --git a/faunadb-scala/src/main/scala/faunadb/values/FieldPath.scala b/faunadb-scala/src/main/scala/faunadb/values/FieldPath.scala
@@ -10,7 +10,7 @@ object FieldPath {
 sealed abstract class FieldPath {
   def subValue(v: Result[Value]): Result[Value]
 
-  def ++(other: FieldPath) =
+  def ++(other: FieldPath): FieldPath =
     this match {
       case FieldPathEmpty => other
       case p              => FieldPathNode(p, other)
@@ -19,7 +19,7 @@ sealed abstract class FieldPath {
 
 case object FieldPathEmpty extends FieldPath {
   override def toString = "/"
-  def subValue(v: Result[Value]) = v
+  def subValue(v: Result[Value]): Result[Value] = v
 }
 
 case class FieldPathField(field: String) extends FieldPath {
diff --git a/faunadb-scala/src/main/scala/faunadb/values/Value.scala b/faunadb-scala/src/main/scala/faunadb/values/Value.scala
@@ -3,7 +3,7 @@ package faunadb.values
 import java.nio.ByteBuffer
 import java.time.{ Instant, LocalDate }
 import java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME
-import java.util.Base64;
+import java.util.Base64
 
 import com.fasterxml.jackson.annotation._
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
diff --git a/faunadb-scala/src/test/scala/faunadb/ClientSpec.scala b/faunadb-scala/src/test/scala/faunadb/ClientSpec.scala
@@ -26,7 +26,7 @@ class ClientSpec
     val scheme = Option(System.getenv("FAUNA_SCHEME")) getOrElse { "https" }
     val port = Option(System.getenv("FAUNA_PORT")) getOrElse { "443" }
 
-    collection.Map("root_token" -> rootKey, "root_url" -> s"${scheme}://${domain}:${port}")
+    collection.Map("root_token" -> rootKey, "root_url" -> s"$scheme://$domain:$port")
   }
 
   val rootClient = FaunaClient(endpoint = config("root_url"), secret = config("root_token"))
@@ -978,7 +978,7 @@ class ClientSpec
   }
 
   it should "create a role" in {
-    val name = s"a_role_${aRandomString}"
+    val name = s"a_role_$aRandomString"
 
     rootClient.query(CreateRole(Obj(
       "name" -> name,
diff --git a/faunadb-scala/src/test/scala/faunadb/CodecSpec.scala b/faunadb-scala/src/test/scala/faunadb/CodecSpec.scala
@@ -102,14 +102,14 @@ class CodecSpec extends FlatSpec with Matchers {
 
   it should "decode aliases" in {
     case class Wrapped(s: String)
-    implicit val wrappedCodec = Codec.Alias[Wrapped, String](_.s, Wrapped(_))
+    implicit val wrappedCodec = Codec.Alias[Wrapped, String](_.s, Wrapped)
 
     val v1 = StringV("hello")
     v1.to[Wrapped].get shouldBe Wrapped("hello")
     (Wrapped("hello"): Value) shouldBe v1
 
     case class DoubleWrapped(w: Wrapped)
-    implicit val doubleWrappedCodec = Codec.Alias[DoubleWrapped, Wrapped](_.w, DoubleWrapped(_))
+    implicit val doubleWrappedCodec = Codec.Alias[DoubleWrapped, Wrapped](_.w, DoubleWrapped)
 
     val v2 = StringV("hello")
     v2.to[DoubleWrapped].get shouldBe DoubleWrapped(Wrapped("hello"))

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ trait FaunaClientFixture extends SuiteMixin with BeforeAndAfterAll { self: fixtu`
`16`	`16`	`val scheme = Option(System.getenv("FAUNA_SCHEME")) getOrElse { "https" }`
`17`	`17`	`val port = Option(System.getenv("FAUNA_PORT")) getOrElse { "443" }`
`18`	`18`
`19`		`- collection.Map("root_token" -> rootKey, "root_url" -> s"${scheme}://${domain}:${port}")`
	`19`	`+ collection.Map("root_token" -> rootKey, "root_url" -> s"$scheme://$domain:$port")`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`_rootClient = FaunaClient(endpoint = config("root_url"), secret = config("root_token"))`