Fixed clients

Author: pc9795

src/main/java/com/exceptionless/exceptionlessclient/submission/DefaultSubmissionClient.java

@@ -13,13 +13,16 @@
 import org.slf4j.LoggerFactory;
 
 import java.net.URI;
+import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.List;
 import java.util.OptionalLong;
+import java.util.stream.Collectors;
 
 public class DefaultSubmissionClient implements SubmissionClientIF {
   private static final Logger LOG = LoggerFactory.getLogger(DefaultSubmissionClient.class);
@@ -50,7 +53,7 @@ public SubmissionResponse postEvents(List<Event> events) {
         String.format(
             "%s/api/v2/events?access_token=%s",
             configuration.getServerUrl(), configuration.getApiKey()),
-        events);
+        events.stream().map(SubmissionMapper::toRequest).collect(Collectors.toList()));
   }
 
   @Override
@@ -59,7 +62,7 @@ public SubmissionResponse postUserDescription(String referenceId, UserDescriptio
         String.format(
             "%s/api/v2/events/by-ref/%s/user-description?access_token=%s",
             configuration.getServerUrl(), referenceId, configuration.getApiKey()),
-        description);
+        SubmissionMapper.toRequest(description));
   }
 
   private SubmissionResponse postSubmission(String url, Object data) {
@@ -79,7 +82,10 @@ private SubmissionResponse postSubmission(String url, Object data) {
       HttpResponse<String> response =
           httpClient.send(request, HttpResponse.BodyHandlers.ofString());
 
-      updateSettingsFromHeaders(response.headers());
+      if (response.statusCode() == 200) {
+        updateSettingsFromHeaders(response.headers());
+      }
+
       return SubmissionResponse.builder()
           .statusCode(response.statusCode())
           .message(response.body())
@@ -106,7 +112,7 @@ public void sendHeartBeat(String sessionIdOrUserId, boolean closeSession) {
               String.format(
                   "%s/api/v2/events/session/heartbeat?id=%s&close=%s&access_token=%s",
                   configuration.getHeartbeatServerUrl(),
-                  sessionIdOrUserId,
+                  URLEncoder.encode(sessionIdOrUserId, StandardCharsets.UTF_8),
                   closeSession,
                   configuration.getApiKey()));
       HttpRequest request =

src/main/java/com/exceptionless/exceptionlessclient/submission/EventRequest.java

@@ -0,0 +1,23 @@
+package com.exceptionless.exceptionlessclient.submission;
+
+import lombok.Builder;
+import lombok.Value;
+
+import java.time.LocalDate;
+import java.util.Map;
+import java.util.Set;
+
+@Value
+@Builder
+public class EventRequest {
+  String type;
+  String source;
+  LocalDate date;
+  Set<String> tags;
+  String message;
+  String geo;
+  String referenceId;
+  long value;
+  Long count;
+  Map<String, Object> data;
+}

src/main/java/com/exceptionless/exceptionlessclient/submission/SubmissionMapper.java

@@ -0,0 +1,31 @@
+package com.exceptionless.exceptionlessclient.submission;
+
+import com.exceptionless.exceptionlessclient.models.Event;
+import com.exceptionless.exceptionlessclient.models.UserDescription;
+
+public final class SubmissionMapper {
+  private SubmissionMapper() {}
+
+  public static UserDescriptionRequest toRequest(UserDescription userDescription) {
+    return UserDescriptionRequest.builder()
+        .description(userDescription.getDescription())
+        .emailAddress(userDescription.getEmailAddress())
+        .data(userDescription.getData())
+        .build();
+  }
+
+  public static EventRequest toRequest(Event event) {
+    return EventRequest.builder()
+        .type(event.getType())
+        .source(event.getSource())
+        .date(event.getDate())
+        .tags(event.getTags())
+        .message(event.getMessage())
+        .geo(event.getGeo())
+        .referenceId(event.getReferenceId())
+        .value(event.getValue())
+        .count(event.getCount())
+        .data(event.getData())
+        .build();
+  }
+}

src/main/java/com/exceptionless/exceptionlessclient/submission/UserDescriptionRequest.java

@@ -0,0 +1,14 @@
+package com.exceptionless.exceptionlessclient.submission;
+
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.Map;
+
+@Value
+@Builder
+public class UserDescriptionRequest {
+  String emailAddress;
+  String description;
+  Map<String, Object> data;
+}