Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change LocalDate to OffsetDateTime for Event #75

Merged
merged 2 commits into from
Nov 18, 2023
Merged

Change LocalDate to OffsetDateTime for Event #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f6ebf
Change LocalDate to OffsetDateTime
pc9795 Nov 18, 2023
4737d2a
Fix UT
pc9795 Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ client uses v4. In that case you have to explicitly declare v4 of the library in
<dependency>
<groupId>com.exceptionless</groupId>
<artifactId>exceptionless-client</artifactId>
<version>1.0-beta1</version>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/exceptionless/exceptionlessclient/ExceptionlessClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;

import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -176,7 +176,7 @@ public Event.EventBuilder createSessionStart() {
}

public Event.EventBuilder createEvent() {
return Event.builder().dataExclusions(configuration.getDataExclusions()).date(LocalDate.now());
return Event.builder().dataExclusions(configuration.getDataExclusions()).date(OffsetDateTime.now());
}

public void submitEvent(Event event) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/exceptionless/exceptionlessclient/models/Event.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.*;
import java.util.stream.Collectors;

Expand All @@ -24,7 +24,7 @@ public class Event extends Model {

private String type;
private String source;
private LocalDate date;
private OffsetDateTime date;
private Set<String> tags;
private String message;
private String geo;
Expand All @@ -36,7 +36,7 @@ public class Event extends Model {
public Event(
String type,
String source,
LocalDate date,
OffsetDateTime date,
Set<String> tags,
String message,
String geo,
Expand All @@ -47,7 +47,7 @@ public Event(
Set<String> dataExclusions) {
this.type = type;
this.source = source;
this.date = date == null ? LocalDate.now() : date;
this.date = date == null ? OffsetDateTime.now() : date;
this.tags = tags == null ? new HashSet<>() : tags;
this.message = message;
this.geo = geo;
Expand Down Expand Up @@ -167,7 +167,7 @@ public EventBuilder source(String source) {
}

@Override
public EventBuilder date(LocalDate date) {
public EventBuilder date(OffsetDateTime date) {
super.date(date);
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/exceptionless/exceptionlessclient/plugins/MergedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import lombok.Builder;
import lombok.Data;

import java.time.LocalDate;
import java.time.OffsetDateTime;

@Data
public class MergedEvent {
Expand All @@ -24,7 +24,7 @@ public void incrementCount(long count) {
event.setCount(event.getCount() + count);
}

public void updateDate(LocalDate date) {
public void updateDate(OffsetDateTime date) {
if (date.isAfter(event.getDate())) {
event.setDate(date);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/exceptionless/exceptionlessclient/submission/EventRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.Builder;
import lombok.Value;

import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.Map;
import java.util.Set;

Expand All @@ -12,7 +12,7 @@
public class EventRequest {
String type;
String source;
LocalDate date;
OffsetDateTime date;
Set<String> tags;
String message;
String geo;
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/exceptionless/exceptionlessclient/ExceptionlessClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public void itCanSubmitAnExceptionEvent() {
argThat(
event ->
event.getType().equals(EventType.ERROR.value())
&& event.getDate().equals(LocalDate.now())
&& event.getReferenceId() != null
&& event.getDate().toLocalDate().equals(LocalDate.now())
&& event.getError().isPresent()
&& event.getEnvironmentInfo().isPresent()
&& event.getData().containsKey(EventPropertyKey.EXTRA.value())));
Expand Down Expand Up @@ -101,7 +101,7 @@ public void itCanSubmitUnhandledExceptionEvent() {
argThat(
event ->
event.getType().equals(EventType.ERROR.value())
&& event.getDate().equals(LocalDate.now())
&& event.getDate().toLocalDate().equals(LocalDate.now())
&& event.getReferenceId() != null
&& event.getError().isPresent()
&& event.getEnvironmentInfo().isPresent()
Expand All @@ -123,8 +123,8 @@ public void itCanSubmitFeatureUsageEvent() {
event ->
event.getType().equals(EventType.USAGE.value())
&& event.getSource().equals("test-feature")
&& event.getDate().equals(LocalDate.now())
&& event.getReferenceId() != null
&& event.getDate().toLocalDate().equals(LocalDate.now())
&& event.getEnvironmentInfo().isPresent()));
assertThat(configuration.getLastReferenceIdManager().getLast()).isNotNull();
}
Expand Down Expand Up @@ -153,7 +153,7 @@ public void itCanSubmitALogEvent() {
event.getType().equals(EventType.LOG.value())
&& event.getSource().equals("test-log-source")
&& event.getMessage().equals("test-log-message")
&& event.getDate().equals(LocalDate.now())
&& event.getDate().toLocalDate().equals(LocalDate.now())
&& event.getReferenceId() != null
&& event.getEnvironmentInfo().isPresent()
&& event.getData().containsKey(EventPropertyKey.LOG_LEVEL.value())));
Expand Down Expand Up @@ -226,7 +226,7 @@ public void itCanSubmitANotFoundEvent() {
event ->
event.getType().equals(EventType.NOT_FOUND.value())
&& event.getSource().equals("test-resource")
&& event.getDate().equals(LocalDate.now())
&& event.getDate().toLocalDate().equals(LocalDate.now())
&& event.getReferenceId() != null
&& event.getEnvironmentInfo().isPresent()));
assertThat(configuration.getLastReferenceIdManager().getLast()).isNotNull();
Expand Down Expand Up @@ -254,7 +254,7 @@ public void itCanSubmitASessionStartEvent() {
argThat(
event ->
event.getType().equals(EventType.SESSION.value())
&& event.getDate().equals(LocalDate.now())
&& event.getDate().toLocalDate().equals(LocalDate.now())
&& event.getReferenceId() != null
&& event.getEnvironmentInfo().isPresent()));
assertThat(configuration.getLastReferenceIdManager().getLast()).isNotNull();
Expand Down
15 changes: 9 additions & 6 deletions src/test/java/com/exceptionless/exceptionlessclient/plugins/MergedEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.mockito.junit.jupiter.MockitoExtension;

import java.time.LocalDate;
import java.time.OffsetDateTime;

import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.times;
Expand All @@ -23,7 +24,7 @@ public class MergedEventTest {
public void setup() {
mergedEvent =
MergedEvent.builder()
.event(Event.builder().date(LocalDate.now()).build())
.event(Event.builder().date(OffsetDateTime.now()).build())
.eventQueue(eventQueue)
.build();
}
Expand All @@ -38,7 +39,7 @@ public void itCanIncrementCount() {

@Test
public void itCanUpdateDate() {
LocalDate tomorrow = LocalDate.now().plusDays(1);
OffsetDateTime tomorrow = OffsetDateTime.now().plusDays(1);
mergedEvent.updateDate(tomorrow);
mergedEvent.resubmit();

Expand All @@ -47,18 +48,20 @@ public void itCanUpdateDate() {

@Test
public void itShouldNotUpdateDateIfSameAsTheEvent() {
mergedEvent.updateDate(LocalDate.now());
mergedEvent.updateDate(OffsetDateTime.now());
mergedEvent.resubmit();

verify(eventQueue, times(1)).enqueue(argThat(event -> event.getDate().equals(LocalDate.now())));
verify(eventQueue, times(1))
.enqueue(argThat(event -> event.getDate().toLocalDate().equals(LocalDate.now())));
}

@Test
public void itShouldNotUpdateDateIfBeforeAsTheEvent() {
LocalDate yesterday = LocalDate.now().minusDays(1);
OffsetDateTime yesterday = OffsetDateTime.now().minusDays(1);
mergedEvent.updateDate(yesterday);
mergedEvent.resubmit();

verify(eventQueue, times(1)).enqueue(argThat(event -> event.getDate().equals(LocalDate.now())));
verify(eventQueue, times(1))
.enqueue(argThat(event -> event.getDate().toLocalDate().equals(LocalDate.now())));
}
}