add 410 and 429 error handling (#366)

* add 410 and 429 error handling

* Try to fix circle ci

* Bump version

---------

Co-authored-by: Cleve Stuart <cleve.stuart@fauna.com>
Co-authored-by: Cleve Stuart <90649124+cleve-fauna@users.noreply.github.com>

.circleci/config.yml

@@ -3,16 +3,11 @@ description: FaunaDB JVM Driver Tests
 
 executors:
   core:
-    parameters:
-      version:
-        type: enum
-        enum: ["nightly"]
     resource_class: large
     docker:
       - image: openjdk:11
-      - image: fauna/faunadb
+      - image: fauna/faunadb:latest
         name: core
-
     environment:
       SBT_VERSION: 1.7.2
       FAUNA_ROOT_KEY: secret
@@ -90,16 +85,15 @@ commands:
           path: results/
 
 jobs:
-  core-nightly:
+  core:
     executor:
       name: core
-      version: nightly
     steps:
       - build_and_test
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - core-nightly:
+      - core:
           context: faunadb-drivers

CHANGELOG.txt

@@ -1,3 +1,7 @@
+4.5.0
+* Emit ResourceNotAvailableException when Fauna returns a 410 status code.
+* Emit TooManyRequestsException when Fauna returns a 429 status code.
+
 4.4.0
 * Support for tags and traceparent headers. PR: https://github.com/fauna/faunadb-jvm/pull/362
 

README.md

@@ -15,8 +15,8 @@ This repository contains the FaunaDB drivers for the JVM languages. Currently, J
 
 Javadocs and Scaladocs are hosted on GitHub:
 
-* [faunadb-java](http://fauna.github.io/faunadb-jvm/4.4.0/faunadb-java/api/)
-* [faunadb-scala](http://fauna.github.io/faunadb-jvm/4.4.0/faunadb-scala/api/)
+* [faunadb-java](http://fauna.github.io/faunadb-jvm/4.5.0/faunadb-java/api/)
+* [faunadb-scala](http://fauna.github.io/faunadb-jvm/4.5.0/faunadb-scala/api/)
 
 Details Documentation for each language:
 
@@ -54,7 +54,7 @@ Download from the Maven central repository:
   <dependency>
     <groupId>com.faunadb</groupId>
     <artifactId>faunadb-java</artifactId>
-    <version>4.4.0</version>
+    <version>4.5.0</version>
     <scope>compile</scope>
   </dependency>
   ...
@@ -207,7 +207,7 @@ List<Value> events = capturedEvents.get();
 ##### faunadb-scala/sbt
 
 ```scala
-libraryDependencies += ("com.faunadb" %% "faunadb-scala" % "4.4.0")
+libraryDependencies += ("com.faunadb" %% "faunadb-scala" % "4.5.0")
 ```
 
 ##### Basic Usage

faunadb-java/src/main/java/com/faunadb/client/FaunaClient.java

@@ -507,6 +507,10 @@ private void handleQueryErrors(int statusCode, String body) {
             throw new NotFoundException(errorResponse);
           case 409:
             throw new TransactionContentionException(errorResponse);
+          case 410:
+            throw new ResourceNotAvailableException(errorResponse);
+          case 429:
+            throw new TooManyRequestsException(errorResponse);
           case 500:
             throw new InternalException(errorResponse);
           case 503:

faunadb-java/src/main/java/com/faunadb/client/errors/ResourceNotAvailableException.java

@@ -0,0 +1,12 @@
+package com.faunadb.client.errors;
+
+import com.faunadb.client.HttpResponses;
+
+public class ResourceNotAvailableException extends FaunaException {
+  public ResourceNotAvailableException(HttpResponses.QueryErrorResponse response) {
+    super(response);
+  }
+  public ResourceNotAvailableException(String message) {
+    super(message);
+  }
+}

faunadb-java/src/main/java/com/faunadb/client/errors/TooManyRequestsException.java

@@ -0,0 +1,12 @@
+package com.faunadb.client.errors;
+
+import com.faunadb.client.HttpResponses;
+
+public class TooManyRequestsException extends FaunaException {
+  public TooManyRequestsException(HttpResponses.QueryErrorResponse response) {
+    super(response);
+  }
+  public TooManyRequestsException(String message) {
+    super(message);
+  }
+}

faunadb-scala/src/main/scala/faunadb/FaunaClient.scala

@@ -459,6 +459,8 @@ class FaunaClient private (connection: Connection) {
       case 403 => parseErrorsAndFailWith(new PermissionDeniedException(_))
       case 404 => parseErrorsAndFailWith(new NotFoundException(_))
       case 409 => parseErrorsAndFailWith(new TransactionContentionException(_))
+      case 410 => parseErrorsAndFailWith(new ResourceNotAvailableException(_))
+      case 429 => parseErrorsAndFailWith(new TooManyRequestsException(_))
       case 500 => parseErrorsAndFailWith(new InternalException(_))
       case 503 => parseErrorsAndFailWith(new UnavailableException(_))
       case _   => parseErrorsAndFailWith(new UnknownException(_))

faunadb-scala/src/main/scala/faunadb/errors/FaunaException.scala

@@ -41,6 +41,23 @@ case class NotFoundException(response: Option[QueryErrorResponse], message: Stri
   def this(response: QueryErrorResponse) = this(Some(response), FaunaException.respToError(response.errors))
 }
 
+/**
+  * An exception thrown if FaunaDB responds with an HTTP 429, meaning the request was throttled.
+  */
+case class TooManyRequestsException(response: Option[QueryErrorResponse], message: String) extends FaunaException(response, message) {
+  def this(message: String) = this(None, message)
+  def this(response: QueryErrorResponse) = this(Some(response), FaunaException.respToError(response.errors))
+}
+
+/**
+  * Exception thrown if FaunaDB responds with an HTTP 410.
+  * One example of this is if an account is disabled.
+  */
+case class ResourceNotAvailableException(response: Option[QueryErrorResponse], message: String) extends FaunaException(response, message) {
+  def this(message: String) = this(None, message)
+  def this(response: QueryErrorResponse) = this(Some(response), FaunaException.respToError(response.errors))
+}
+
 /**
  * An exception thrown if FaunaDB responds with an HTTP 500. Such errors represent an internal
  * failure within the database.

project/Settings.scala

@@ -6,7 +6,7 @@ import scoverage.ScoverageSbtPlugin.autoImport._
 
 object Settings {
 
-  lazy val driverVersion = "4.4.0"
+  lazy val driverVersion = "4.5.0"
 
   lazy val scala211 = "2.11.12"
   lazy val scala212 = "2.12.14"