Converting to factory of exception and not handler

Author: vladimanaev

src/main/java/com/taboola/rest/api/exceptions/factories/DefaultExceptionFactory.java

@@ -14,22 +14,22 @@
 public class DefaultExceptionFactory implements ExceptionFactory {
 
     @Override
-    public void handleAndThrowUnauthorizedException(Throwable cause) {
-        throw new RestAPIUnauthorizedException(cause);
+    public RuntimeException createUnauthorizedException(Throwable cause) {
+        return new RestAPIUnauthorizedException(cause);
     }
 
     @Override
-    public void handleAndThrowRequestException(int responseCode, byte[] errorPayloadBytes, String message) {
-        throw new RestAPIRequestException("message: %s, responseCode: %s", MessageHandlingUtils.normalizeErrorMsg(message), responseCode);
+    public RuntimeException createRequestException(int responseCode, byte[] errorPayloadBytes, String message) {
+        return new RestAPIRequestException("message: %s, responseCode: %s", MessageHandlingUtils.normalizeErrorMsg(message), responseCode);
     }
 
     @Override
-    public void handleAndThrowConnectivityException(Throwable cause, int responseCode) {
-        throw new RestAPIConnectivityException(cause, responseCode);
+    public RuntimeException createConnectivityException(Throwable cause, int responseCode) {
+        return new RestAPIConnectivityException(cause, responseCode);
     }
 
     @Override
-    public void handleAndThrowConnectivityException(Throwable cause) {
-        throw new RestAPIConnectivityException(cause);
+    public RuntimeException createConnectivityException(Throwable cause) {
+        return new RestAPIConnectivityException(cause);
     }
 }

src/main/java/com/taboola/rest/api/exceptions/factories/ExceptionFactory.java

@@ -8,11 +8,11 @@
  */
 public interface ExceptionFactory {
 
-    void handleAndThrowUnauthorizedException(Throwable cause);
+    RuntimeException createUnauthorizedException(Throwable cause);
 
-    void handleAndThrowRequestException(int responseCode, byte[] errorBytes, String message);
+    RuntimeException createRequestException(int responseCode, byte[] errorBytes, String message);
 
-    void handleAndThrowConnectivityException(Throwable cause, int responseCode);
+    RuntimeException createConnectivityException(Throwable cause, int responseCode);
 
-    void handleAndThrowConnectivityException(Throwable cause);
+    RuntimeException createConnectivityException(Throwable cause);
 }

src/main/java/com/taboola/rest/api/internal/SynchronousCallAdapterFactory.java

@@ -62,19 +62,19 @@ public Object adapt(Call<Object> call) {
                     } else {
                         int responseCode = response.code();
                         if(responseCode == UNAUTHORIZED_HTTP_STATUS_CODE) {
-                            exceptionFactory.handleAndThrowUnauthorizedException(safeCreateCauseException(response));
+                            throwIfNotNull(exceptionFactory.createUnauthorizedException(safeCreateCauseException(response)));
 
                         } else if(responseCode >= BAD_REQUEST_HTTP_STATUS_CODE && responseCode < INTERNAL_SERVER_ERROR_HTTP_STATUS_CODE) {
                             String message = response.message();
-                            exceptionFactory.handleAndThrowRequestException(responseCode, safeGetErrorPayloadBytes(response, message, responseCode), message);
+                            throwIfNotNull(exceptionFactory.createRequestException(responseCode, safeGetErrorPayloadBytes(response, message, responseCode), message));
                         }
 
-                        exceptionFactory.handleAndThrowConnectivityException(safeCreateCauseException(response), responseCode);
+                        throwIfNotNull(exceptionFactory.createConnectivityException(safeCreateCauseException(response), responseCode));
                     }
 
                 } catch (IOException e) {
                     logger.error(e);
-                    exceptionFactory.handleAndThrowConnectivityException(e);
+                    throwIfNotNull(exceptionFactory.createConnectivityException(e));
                 }
 
                 if(obj == null) {
@@ -103,4 +103,10 @@ private IOException safeCreateCauseException(Response<Object> response) {
             return new IOException("Failed to parse API error response", t);
         }
     }
+
+    private void throwIfNotNull(RuntimeException e) {
+        if(e != null) {
+            throw e;
+        }
+    }
 }