Merge pull request #23 from exceptionless/testing

Testing

Author: pc9795

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.exceptionless</groupId>
     <artifactId>exceptionless-client</artifactId>
-    <version>1.0</version>
+    <version>1.0-beta1</version>
 
     <dependencies>
         <dependency>
@@ -34,6 +34,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.30</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.10.0</version>
+        </dependency>
         <!--Test Dependencies-->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -79,6 +84,17 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <!--2.22.0 is required for Junit 5 tests-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
+                <configuration>
+                    <argLine>
+                        --illegal-access=permit
+                    </argLine>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

samples/example-app/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.exceptionless</groupId>
     <artifactId>example-app</artifactId>
-    <version>1.0</version>
+    <version>1.0-beta1</version>
 
     <dependencies>
         <dependency>

src/main/java/com/exceptionless/exceptionlessclient/configuration/Configuration.java

@@ -38,9 +38,9 @@ public Configuration(
         updateSettingsWhenIdleInterval == null ? 12000L : updateSettingsWhenIdleInterval;
     this.submissionBatchSize = submissionBatchSize == null ? 50 : submissionBatchSize;
     this.submissionClientTimeoutInMillis =
-        submissionClientTimeoutInMillis == null ? 100 : submissionClientTimeoutInMillis;
+        submissionClientTimeoutInMillis == null ? 500 : submissionClientTimeoutInMillis;
     this.settingsClientTimeoutInMillis =
-        settingsClientTimeoutInMillis == null ? 100 : settingsClientTimeoutInMillis;
+        settingsClientTimeoutInMillis == null ? 500 : settingsClientTimeoutInMillis;
     this.propertyChangeSupport = new PropertyChangeSupport(this);
   }
 

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

@@ -42,7 +42,7 @@ public SettingsResponse getSettings(long version) {
           HttpRequest.newBuilder()
               .uri(uri)
               .GET()
-              .header("X-Exceptionless-Client", Configuration.USER_AGENT)
+              .header("User-Agent", Configuration.USER_AGENT)
               .timeout(Duration.ofMillis(configuration.getSettingsClientTimeoutInMillis()))
               .build();
 

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) {
@@ -72,14 +75,17 @@ private SubmissionResponse postSubmission(String url, Object data) {
               .uri(uri)
               .POST(HttpRequest.BodyPublishers.ofString(requestJSON))
               .header("Content-Type", "application/json")
-              .header("X-Exceptionless-Client", Configuration.USER_AGENT)
+              .header("User-Agent", Configuration.USER_AGENT)
               .timeout(Duration.ofMillis(configuration.getSubmissionClientTimeoutInMillis()))
               .build();
 
       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;
+}

src/main/java/com/exceptionless/exceptionlessclient/utils/Utils.java

@@ -1,6 +1,8 @@
 package com.exceptionless.exceptionlessclient.utils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -9,7 +11,12 @@
 import java.util.*;
 
 public final class Utils {
-  public static final ObjectMapper JSON_MAPPER = new ObjectMapper();
+  public static final ObjectMapper JSON_MAPPER;
+  static {
+    JSON_MAPPER = new ObjectMapper();
+    JSON_MAPPER.registerModule(new JavaTimeModule());
+    JSON_MAPPER.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+  }
 
   private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
 

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

@@ -48,10 +48,10 @@ public void itCanHandleASuccessfulResponse() throws IOException, InterruptedExce
                     httpRequest.method().equals("GET")
                         && httpRequest.timeout().isPresent()
                         && httpRequest.timeout().get().equals(Duration.ofMillis(10))
-                        && httpRequest.headers().firstValue("X-Exceptionless-Client").isPresent()
+                        && httpRequest.headers().firstValue("User-Agent").isPresent()
                         && httpRequest
                             .headers()
-                            .firstValue("X-Exceptionless-Client")
+                            .firstValue("User-Agent")
                             .get()
                             .equals("exceptionless-java")
                         && httpRequest