By default normalizing error response message only on cases that can effect String.format

Author: vladimanaev

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

@@ -3,6 +3,7 @@
 import com.taboola.rest.api.exceptions.RestAPIConnectivityException;
 import com.taboola.rest.api.exceptions.RestAPIRequestException;
 import com.taboola.rest.api.exceptions.RestAPIUnauthorizedException;
+import com.taboola.rest.api.internal.MessageHandlingUtils;
 
 /**
  * Created by vladi.m
@@ -19,7 +20,7 @@ public void handleAndThrowUnauthorizedException(Throwable cause) {
 
     @Override
     public void handleAndThrowRequestException(int responseCode, byte[] errorPayloadBytes, String message) {
-        throw new RestAPIRequestException("message: %s, responseCode: %s", message, responseCode);
+        throw new RestAPIRequestException("message: %s, responseCode: %s", MessageHandlingUtils.normalizeErrorMsg(message), responseCode);
     }
 
     @Override

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

@@ -0,0 +1,18 @@
+package com.taboola.rest.api.internal;
+
+/**
+ * Created by vladi.m
+ * Date 28/06/2021
+ * Time 16:52
+ * Copyright Taboola
+ */
+public class MessageHandlingUtils {
+
+    public static String normalizeErrorMsg(String message) {
+        if(message != null) {
+            return message.replaceAll("%", "%%");
+        }
+
+        return "";
+    }
+}

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

@@ -65,7 +65,7 @@ public Object adapt(Call<Object> call) {
                             exceptionFactory.handleAndThrowUnauthorizedException(safeCreateCauseException(response));
 
                         } else if(responseCode >= BAD_REQUEST_HTTP_STATUS_CODE && responseCode < INTERNAL_SERVER_ERROR_HTTP_STATUS_CODE) {
-                            String message = normalizeErrorMsg(response.message());
+                            String message = response.message();
                             exceptionFactory.handleAndThrowRequestException(responseCode, safeGetErrorPayloadBytes(response, message, responseCode), message);
                         }
 
@@ -91,7 +91,7 @@ private byte[] safeGetErrorPayloadBytes(Response<Object> response, String messag
             return response.errorBody().bytes();
         } catch(Throwable t) {
             logger.warn("Failed to extract byte[] from response error body", t);
-            throw new RestAPIRequestException("message: %s, responseCode: %s", message, responseCode);
+            throw new RestAPIRequestException("message: %s, responseCode: %s", MessageHandlingUtils.normalizeErrorMsg(message), responseCode);
         }
     }
 
@@ -103,12 +103,4 @@ private IOException safeCreateCauseException(Response<Object> response) {
             return new IOException("Failed to parse API error response", t);
         }
     }
-
-    private String normalizeErrorMsg(String message) {
-        if(message != null) {
-            return message.replaceAll("%", "%%");
-        }
-
-        return "";
-    }
 }