Removed SettingsClientException

Author: pc9795

src/main/java/com/exceptionless/exceptionlessclient/ExceptionlessClient.java

@@ -2,14 +2,14 @@
 
 import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
+import com.exceptionless.exceptionlessclient.enums.EventType;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.models.PluginContext;
 import com.exceptionless.exceptionlessclient.models.UserDescription;
-import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
-import com.exceptionless.exceptionlessclient.enums.EventType;
-import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginRunner;
+import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
 import com.exceptionless.exceptionlessclient.utils.VisibleForTesting;
 import lombok.Builder;
 import lombok.Getter;
@@ -269,9 +269,16 @@ public SubmissionResponse updateEmailAndDescription(
             .postUserDescription(
                 referenceId,
                 UserDescription.builder().description(description).emailAddress(email).build());
+    if (response.hasException()) {
+      log.error(
+          String.format("Failed to submit user email and description for event: %s", referenceId),
+          response.getException());
+    }
     if (!response.isSuccess()) {
       log.error(
-          String.format("Failed to submit user email and description for event: %s", referenceId));
+          String.format(
+              "Failed to submit user email and description for event: %s, code: %s",
+              referenceId, response.getCode()));
     }
 
     return response;

src/main/java/com/exceptionless/exceptionlessclient/exceptions/SettingsClientException.java

@@ -1,7 +1,6 @@
 package com.exceptionless.exceptionlessclient.settings;
 
 import com.exceptionless.exceptionlessclient.configuration.Configuration;
-import com.exceptionless.exceptionlessclient.exceptions.SettingsClientException;
 import com.exceptionless.exceptionlessclient.utils.Utils;
 import com.exceptionless.exceptionlessclient.utils.VisibleForTesting;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -64,7 +63,7 @@ public SettingsResponse getSettings(long version) {
           .settings(serverSettings)
           .build();
     } catch (Exception e) {
-      throw new SettingsClientException(e);
+      return SettingsResponse.builder().exception(e).build();
     }
   }
 }

src/main/java/com/exceptionless/exceptionlessclient/settings/DefaultSettingsClient.java

@@ -1,6 +1,5 @@
 package com.exceptionless.exceptionlessclient.settings;
 
-import com.exceptionless.exceptionlessclient.exceptions.SettingsClientException;
 import com.exceptionless.exceptionlessclient.models.storage.StorageItem;
 import com.exceptionless.exceptionlessclient.storage.StorageProviderIF;
 import lombok.Builder;
@@ -80,8 +79,6 @@ public void updateSettings() {
       storageProvider.getSettings().save(response.getSettings());
       propertyChangeSupport.firePropertyChange(
           Property.SETTINGS, prevValue, response.getSettings());
-    } catch (SettingsClientException e) {
-      log.error(String.format("Error retrieving settings for v%s", getVersion()), e);
     } finally {
       synchronized (this) {
         updatingSettings = false;
@@ -90,6 +87,12 @@ public void updateSettings() {
   }
 
   private boolean shouldNotUpdate(SettingsResponse response) {
+    if (response.hasException()) {
+      log.error(
+          String.format("Error retrieving settings for v%s", getVersion()),
+          response.getException());
+      return true;
+    }
     if (response.isNotModified()) {
       log.debug("No need to update, settings are not modified");
       return true;

src/main/java/com/exceptionless/exceptionlessclient/settings/SettingsManager.java

@@ -9,6 +9,7 @@ public class SettingsResponse {
   int code;
   String body;
   ServerSettings settings;
+  Exception exception;
 
   public boolean isSuccess() {
     return code >= 200 && code <= 299;
@@ -17,4 +18,8 @@ public boolean isSuccess() {
   public boolean isNotModified() {
     return code == 304;
   }
+
+  public boolean hasException() {
+    return exception != null;
+  }
 }

src/main/java/com/exceptionless/exceptionlessclient/settings/SettingsResponse.java

@@ -2,7 +2,6 @@
 
 import com.exceptionless.exceptionlessclient.TestFixtures;
 import com.exceptionless.exceptionlessclient.configuration.Configuration;
-import com.exceptionless.exceptionlessclient.exceptions.SettingsClientException;
 import okhttp3.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -14,7 +13,6 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.doReturn;
@@ -101,12 +99,13 @@ public void itCanHandleNullSettingsReturnedByTheServer() throws IOException {
   }
 
   @Test
-  public void itCanMapAnyExceptionToSettingsClientException() {
-    RuntimeException e = new RuntimeException("test");
+  public void itCanHandleAllExceptions() {
+    Exception e = new RuntimeException("test");
     doThrow(e).when(httpClient).newCall(any());
 
-    assertThatThrownBy(() -> settingsClient.getSettings(1))
-        .isInstanceOf(SettingsClientException.class)
-        .hasMessage("java.lang.RuntimeException: test");
+    SettingsResponse response = settingsClient.getSettings(1);
+
+    assertThat(response.hasException()).isTrue();
+    assertThat(response.getException()).isSameAs(e);
   }
 }

src/test/java/com/exceptionless/exceptionlessclient/settings/DefaultSettingsClientTest.java

@@ -1,6 +1,5 @@
 package com.exceptionless.exceptionlessclient.settings;
 
-import com.exceptionless.exceptionlessclient.exceptions.SettingsClientException;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorage;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorageProvider;
 import org.junit.jupiter.api.BeforeEach;
@@ -152,7 +151,9 @@ public void itWillNotSaveSettingsIfNoSettingsReturnedByTheServer() {
 
   @Test
   public void itCanHandleSettingsClientException() {
-    doThrow(new SettingsClientException("test")).when(settingsClient).getSettings(anyLong());
+    doReturn(SettingsResponse.builder().exception(new RuntimeException("test")).build())
+        .when(settingsClient)
+        .getSettings(anyLong());
 
     settingsManager.updateSettings();
   }