Merge pull request #91 from simplelocalize/adjust-client-request

Adjust error handling

Author: jpomykala

src/main/java/io/simplelocalize/cli/SimplelocalizeCliCommand.java

@@ -512,7 +512,14 @@ private void trySendException(Exception exception)
       client.sendException(effectiveCommandConfiguration, exception);
     } catch (Exception ex)
     {
-      log.error("Unable to send exception to SimpleLocalize, please contact us at [email protected]. {}", ex.getMessage());
+      if (debug)
+      {
+        log.error("Unable to send exception", ex);
+      } else
+      {
+        log.error("Unable to send exception to SimpleLocalize, please contact us at [email protected]. {}", ex.getMessage());
+      }
+
       if (ex instanceof InterruptedException)
       {
         Thread.currentThread().interrupt();

src/main/java/io/simplelocalize/cli/client/SimpleLocalizeClient.java

@@ -178,7 +178,7 @@ private void throwOnError(HttpResponse<?> httpResponse)
         message = "Unknown error, HTTP Status: " + httpResponse.statusCode();
       }
       log.error("Request failed: {}", message);
-      throw new ApiRequestException(message, httpResponse);
+      throw new ApiRequestException(message);
     }
   }
 

src/main/java/io/simplelocalize/cli/configuration/ConfigurationValidator.java

@@ -8,8 +8,6 @@
 
 public final class ConfigurationValidator
 {
-  private static final Logger log = LoggerFactory.getLogger(ConfigurationValidator.class);
-
   public void validateExtractConfiguration(Configuration configuration)
   {
     validateIsNotEmptyOrNull(configuration.getApiKey(), "apiKey");
@@ -63,8 +61,8 @@ private void validateIsNotEmptyOrNull(String format, String argumentName)
 
     if (StringUtils.isEmpty(format))
     {
-      log.error("Missing '{}' value", argumentName);
-      throw new ConfigurationException();
+      String message = "Missing '%s' value".formatted(argumentName);
+      throw new ConfigurationException(message);
     }
   }
 }

src/main/java/io/simplelocalize/cli/exception/ApiRequestException.java

@@ -1,27 +1,9 @@
 package io.simplelocalize.cli.exception;
 
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.util.Optional;
-
 public class ApiRequestException extends RuntimeException
 {
-
-  private final transient HttpResponse<?> httpResponse;
-
-  public ApiRequestException(String apiMessage, HttpResponse<?> httpResponse)
+  public ApiRequestException(String apiMessage)
   {
     super(apiMessage);
-    this.httpResponse = httpResponse;
-  }
-
-  public HttpResponse<?> getHttpResponse()
-  {
-    return httpResponse;
-  }
-
-  public HttpRequest getHttpRequest()
-  {
-    return Optional.ofNullable(httpResponse).map(HttpResponse::request).orElse(null);
   }
 }