Skip to content

Commit f73b45a

Browse files
pc9795pc9795
authored
Change LocalDate to OffsetDateTime for Event (#75)
* Change LocalDate to OffsetDateTime * Fix UT
1 parent 0d0fbbf commit f73b45a

File tree

7 files changed

+27
-24
lines changed

7 files changed

+27
-24
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ client uses v4. In that case you have to explicitly declare v4 of the library in
9595
<dependency>
9696
<groupId>com.exceptionless</groupId>
9797
<artifactId>exceptionless-client</artifactId>
98-
<version>1.0-beta1</version>
98+
<version>0.1.0</version>
9999
</dependency>
100100
<dependency>
101101
<groupId>org.springframework.boot</groupId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import lombok.Getter;
1515
import lombok.extern.slf4j.Slf4j;
1616

17-
import java.time.LocalDate;
17+
import java.time.OffsetDateTime;
1818
import java.util.Timer;
1919
import java.util.TimerTask;
2020
import java.util.concurrent.ExecutorService;
@@ -176,7 +176,7 @@ public Event.EventBuilder createSessionStart() {
176176
}
177177

178178
public Event.EventBuilder createEvent() {
179-
return Event.builder().dataExclusions(configuration.getDataExclusions()).date(LocalDate.now());
179+
return Event.builder().dataExclusions(configuration.getDataExclusions()).date(OffsetDateTime.now());
180180
}
181181

182182
public void submitEvent(Event event) {

‎src/main/java/com/exceptionless/exceptionlessclient/models/Event.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import lombok.Data;
1212
import lombok.EqualsAndHashCode;
1313

14-
import java.time.LocalDate;
14+
import java.time.OffsetDateTime;
1515
import java.util.*;
1616
import java.util.stream.Collectors;
1717

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

2525
private String type;
2626
private String source;
27-
private LocalDate date;
27+
private OffsetDateTime date;
2828
private Set<String> tags;
2929
private String message;
3030
private String geo;
@@ -36,7 +36,7 @@ public class Event extends Model {
3636
public Event(
3737
String type,
3838
String source,
39-
LocalDate date,
39+
OffsetDateTime date,
4040
Set<String> tags,
4141
String message,
4242
String geo,
@@ -47,7 +47,7 @@ public Event(
4747
Set<String> dataExclusions) {
4848
this.type = type;
4949
this.source = source;
50-
this.date = date == null ? LocalDate.now() : date;
50+
this.date = date == null ? OffsetDateTime.now() : date;
5151
this.tags = tags == null ? new HashSet<>() : tags;
5252
this.message = message;
5353
this.geo = geo;
@@ -167,7 +167,7 @@ public EventBuilder source(String source) {
167167
}
168168

169169
@Override
170-
public EventBuilder date(LocalDate date) {
170+
public EventBuilder date(OffsetDateTime date) {
171171
super.date(date);
172172
return this;
173173
}

‎src/main/java/com/exceptionless/exceptionlessclient/plugins/MergedEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import lombok.Builder;
66
import lombok.Data;
77

8-
import java.time.LocalDate;
8+
import java.time.OffsetDateTime;
99

1010
@Data
1111
public class MergedEvent {
@@ -24,7 +24,7 @@ public void incrementCount(long count) {
2424
event.setCount(event.getCount() + count);
2525
}
2626

27-
public void updateDate(LocalDate date) {
27+
public void updateDate(OffsetDateTime date) {
2828
if (date.isAfter(event.getDate())) {
2929
event.setDate(date);
3030
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.Builder;
44
import lombok.Value;
55

6-
import java.time.LocalDate;
6+
import java.time.OffsetDateTime;
77
import java.util.Map;
88
import java.util.Set;
99

@@ -12,7 +12,7 @@
1212
public class EventRequest {
1313
String type;
1414
String source;
15-
LocalDate date;
15+
OffsetDateTime date;
1616
Set<String> tags;
1717
String message;
1818
String geo;

‎src/test/java/com/exceptionless/exceptionlessclient/ExceptionlessClientTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public void itCanSubmitAnExceptionEvent() {
7272
argThat(
7373
event ->
7474
event.getType().equals(EventType.ERROR.value())
75-
&& event.getDate().equals(LocalDate.now())
7675
&& event.getReferenceId() != null
76+
&& event.getDate().toLocalDate().equals(LocalDate.now())
7777
&& event.getError().isPresent()
7878
&& event.getEnvironmentInfo().isPresent()
7979
&& event.getData().containsKey(EventPropertyKey.EXTRA.value())));
@@ -101,7 +101,7 @@ public void itCanSubmitUnhandledExceptionEvent() {
101101
argThat(
102102
event ->
103103
event.getType().equals(EventType.ERROR.value())
104-
&& event.getDate().equals(LocalDate.now())
104+
&& event.getDate().toLocalDate().equals(LocalDate.now())
105105
&& event.getReferenceId() != null
106106
&& event.getError().isPresent()
107107
&& event.getEnvironmentInfo().isPresent()
@@ -123,8 +123,8 @@ public void itCanSubmitFeatureUsageEvent() {
123123
event ->
124124
event.getType().equals(EventType.USAGE.value())
125125
&& event.getSource().equals("test-feature")
126-
&& event.getDate().equals(LocalDate.now())
127126
&& event.getReferenceId() != null
127+
&& event.getDate().toLocalDate().equals(LocalDate.now())
128128
&& event.getEnvironmentInfo().isPresent()));
129129
assertThat(configuration.getLastReferenceIdManager().getLast()).isNotNull();
130130
}
@@ -153,7 +153,7 @@ public void itCanSubmitALogEvent() {
153153
event.getType().equals(EventType.LOG.value())
154154
&& event.getSource().equals("test-log-source")
155155
&& event.getMessage().equals("test-log-message")
156-
&& event.getDate().equals(LocalDate.now())
156+
&& event.getDate().toLocalDate().equals(LocalDate.now())
157157
&& event.getReferenceId() != null
158158
&& event.getEnvironmentInfo().isPresent()
159159
&& event.getData().containsKey(EventPropertyKey.LOG_LEVEL.value())));
@@ -226,7 +226,7 @@ public void itCanSubmitANotFoundEvent() {
226226
event ->
227227
event.getType().equals(EventType.NOT_FOUND.value())
228228
&& event.getSource().equals("test-resource")
229-
&& event.getDate().equals(LocalDate.now())
229+
&& event.getDate().toLocalDate().equals(LocalDate.now())
230230
&& event.getReferenceId() != null
231231
&& event.getEnvironmentInfo().isPresent()));
232232
assertThat(configuration.getLastReferenceIdManager().getLast()).isNotNull();
@@ -254,7 +254,7 @@ public void itCanSubmitASessionStartEvent() {
254254
argThat(
255255
event ->
256256
event.getType().equals(EventType.SESSION.value())
257-
&& event.getDate().equals(LocalDate.now())
257+
&& event.getDate().toLocalDate().equals(LocalDate.now())
258258
&& event.getReferenceId() != null
259259
&& event.getEnvironmentInfo().isPresent()));
260260
assertThat(configuration.getLastReferenceIdManager().getLast()).isNotNull();

‎src/test/java/com/exceptionless/exceptionlessclient/plugins/MergedEventTest.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.mockito.junit.jupiter.MockitoExtension;
1010

1111
import java.time.LocalDate;
12+
import java.time.OffsetDateTime;
1213

1314
import static org.mockito.ArgumentMatchers.argThat;
1415
import static org.mockito.Mockito.times;
@@ -23,7 +24,7 @@ public class MergedEventTest {
2324
public void setup() {
2425
mergedEvent =
2526
MergedEvent.builder()
26-
.event(Event.builder().date(LocalDate.now()).build())
27+
.event(Event.builder().date(OffsetDateTime.now()).build())
2728
.eventQueue(eventQueue)
2829
.build();
2930
}
@@ -38,7 +39,7 @@ public void itCanIncrementCount() {
3839

3940
@Test
4041
public void itCanUpdateDate() {
41-
LocalDate tomorrow = LocalDate.now().plusDays(1);
42+
OffsetDateTime tomorrow = OffsetDateTime.now().plusDays(1);
4243
mergedEvent.updateDate(tomorrow);
4344
mergedEvent.resubmit();
4445

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

4849
@Test
4950
public void itShouldNotUpdateDateIfSameAsTheEvent() {
50-
mergedEvent.updateDate(LocalDate.now());
51+
mergedEvent.updateDate(OffsetDateTime.now());
5152
mergedEvent.resubmit();
5253

53-
verify(eventQueue, times(1)).enqueue(argThat(event -> event.getDate().equals(LocalDate.now())));
54+
verify(eventQueue, times(1))
55+
.enqueue(argThat(event -> event.getDate().toLocalDate().equals(LocalDate.now())));
5456
}
5557

5658
@Test
5759
public void itShouldNotUpdateDateIfBeforeAsTheEvent() {
58-
LocalDate yesterday = LocalDate.now().minusDays(1);
60+
OffsetDateTime yesterday = OffsetDateTime.now().minusDays(1);
5961
mergedEvent.updateDate(yesterday);
6062
mergedEvent.resubmit();
6163

62-
verify(eventQueue, times(1)).enqueue(argThat(event -> event.getDate().equals(LocalDate.now())));
64+
verify(eventQueue, times(1))
65+
.enqueue(argThat(event -> event.getDate().toLocalDate().equals(LocalDate.now())));
6366
}
6467
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy