RCB-597: handling ErrorResponses

Author: Adam Soos

api/src/main/java/com/basistech/rosette/api/HttpRosetteAPI.java

@@ -620,21 +620,19 @@ private <T extends Object> T getResponse(HttpResponse httpResponse, Class<T> cla
      * @param request the request object
      * @param responseClass Response's class
      * @return RequestThread which when started sends the predefined request through this http client
-     * @param <R>  Type of the response
      */
-    public <R extends Response> RosetteRequest<R> createRosetteRequest(String endpoint,
-                                                                       Request request,
-                                                                       Class<R> responseClass) {
-        return new RosetteRequest<>(this, request, endpoint, responseClass);
+    public RosetteRequest createRosetteRequest(String endpoint,
+                                               Request request,
+                                               Class<? extends Response> responseClass) {
+        return new RosetteRequest(this, request, endpoint, responseClass);
     }
 
     /**
      * Sends the request concurrently
      * @param request the request to be sent
      * @return A Future with the response of the request
-     * @param <R> type of the response object
      */
-    public <R extends Response> Future<R> submitRequest(RosetteRequest<R> request) {
+    public Future<Response> submitRequest(RosetteRequest request) {
         return this.threadPool.submit(request);
     }
 
@@ -643,7 +641,7 @@ public <R extends Response> Future<R> submitRequest(RosetteRequest<R> request) {
      * @param requests list of the requests to be sent
      * @return A list of Futures with the responses to the requests
      */
-    public List<Future<? extends Response>> submitRequests(Collection<RosetteRequest<? extends Response>> requests) {
+    public List<Future<Response>> submitRequests(Collection<RosetteRequest> requests) {
         return requests.stream()
                 .map(this::submitRequest)
                 .collect(Collectors.toList());

api/src/main/java/com/basistech/rosette/api/RosetteRequest.java

@@ -22,31 +22,34 @@
 
 /**
  * This class encompasses a future request that can be sent concurrently
- * @param <R> type of the response object
  */
-public class RosetteRequest<R extends Response> implements Callable<R> {
+public class RosetteRequest implements Callable<Response> {
     private final HttpRosetteAPI api;
     private final Request request;
     private final String servicePath;
-    private final Class<R> responseClass;
-    private R response;
+    private final Class<? extends Response> responseClass;
+    private Response response;
 
     RosetteRequest(HttpRosetteAPI api,
                    Request request,
-                   String servicePath, Class<R> responseClass) {
+                   String servicePath, Class<? extends Response> responseClass) {
         this.api = api;
         this.request = request;
         this.servicePath = servicePath;
         this.responseClass = responseClass;
     }
 
     @Override
-    public R call() {
-        this.response = api.perform(this.servicePath, this.request, this.responseClass);
+    public Response call() {
+        try {
+            this.response = api.perform(this.servicePath, this.request, this.responseClass);
+        } catch (HttpRosetteAPIException ex) {
+            this.response = ex.getErrorResponse();
+        }
         return this.response;
     }
 
-    public R getResponse() {
+    public Response getResponse() {
         return this.response;
     }
 }

examples/src/main/java/com/basistech/rosette/examples/ConcurrencyExample.java

@@ -67,7 +67,7 @@ private  void run() throws IOException, ExecutionException, InterruptedException
                 .connectionConcurrency(maximumConcurrency)
                 .build();
 
-        List<RosetteRequest<? extends Response>> threads = new ArrayList<>();
+        List<RosetteRequest> threads = new ArrayList<>();
         // Setting up entities request
         String entitiesTextData =
                 "The Securities and Exchange Commission today announced the leadership of the agency’s trial unit. "
@@ -89,10 +89,9 @@ private  void run() throws IOException, ExecutionException, InterruptedException
                         LanguageResponse.class)
         );
         // Setting up morphology request
-        String morphologyCompleteData = "The quick brown fox jumped over the lazy dog. 👍🏾 Yes he did. B)";
         threads.add(
                 rosetteApi.createRosetteRequest(MORPHOLOGY_SERVICE_PATH + "/" + MorphologicalFeature.COMPLETE,
-                        DocumentRequest.<MorphologyOptions>builder().content(morphologyCompleteData).build(),
+                        DocumentRequest.<MorphologyOptions>builder().build(),
                         MorphologyResponse.class)
         );
         //Setting up names deduplication request
@@ -125,7 +124,7 @@ private  void run() throws IOException, ExecutionException, InterruptedException
         );
 
         // start the threads
-        List<Future<? extends Response>> futures = rosetteApi.submitRequests(threads);
+        List<Future<Response>> futures = rosetteApi.submitRequests(threads);
 
         // wait for the threads to finish
         for (int i = 0; i < threads.size(); i++) {