Skip to content

Commit e56d9bb

Browse files
authored
Merge branch 'master' into patch-1
2 parents 8d2230f + e715cc5 commit e56d9bb

File tree

3 files changed

+39
-14
lines changed

3 files changed

+39
-14
lines changed

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@
9999
<dependency>
100100
<groupId>com.fasterxml.jackson</groupId>
101101
<artifactId>jackson-bom</artifactId>
102-
<version>2.17.1</version>
102+
<version>2.17.2</version>
103103
<type>pom</type>
104104
<scope>import</scope>
105105
</dependency>
106106
<dependency>
107107
<groupId>io.netty</groupId>
108108
<artifactId>netty-bom</artifactId>
109-
<version>4.1.111.Final</version>
109+
<version>4.1.115.Final</version>
110110
<type>pom</type>
111111
<scope>import</scope>
112112
</dependency>
@@ -117,7 +117,7 @@
117117
<dependency>
118118
<groupId>org.slf4j</groupId>
119119
<artifactId>slf4j-api</artifactId>
120-
<version>2.0.13</version>
120+
<version>2.0.16</version>
121121
</dependency>
122122
<dependency>
123123
<groupId>org.asynchttpclient</groupId>
@@ -152,7 +152,7 @@
152152
<dependency>
153153
<groupId>org.slf4j</groupId>
154154
<artifactId>slf4j-simple</artifactId>
155-
<version>2.0.13</version>
155+
<version>2.0.16</version>
156156
<scope>test</scope>
157157
</dependency>
158158
<dependency>
@@ -165,7 +165,7 @@
165165
<groupId>org.assertj</groupId>
166166
<artifactId>assertj-core</artifactId>
167167
<!-- use 2.9.0 for Java 7 projects -->
168-
<version>3.26.0</version>
168+
<version>3.26.3</version>
169169
<scope>test</scope>
170170
</dependency>
171171
<dependency>
@@ -177,7 +177,7 @@
177177
<dependency>
178178
<groupId>org.awaitility</groupId>
179179
<artifactId>awaitility</artifactId>
180-
<version>4.2.1</version>
180+
<version>4.2.2</version>
181181
<scope>test</scope>
182182
</dependency>
183183
</dependencies>
@@ -208,12 +208,12 @@
208208
<dependency>
209209
<groupId>org.codehaus.mojo</groupId>
210210
<artifactId>animal-sniffer-enforcer-rule</artifactId>
211-
<version>1.23</version>
211+
<version>1.24</version>
212212
</dependency>
213213
<dependency>
214214
<groupId>org.codehaus.mojo</groupId>
215215
<artifactId>extra-enforcer-rules</artifactId>
216-
<version>1.8.0</version>
216+
<version>1.9.0</version>
217217
</dependency>
218218
</dependencies>
219219
<executions>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,42 @@
11
package org.zendesk.client.v2.model.comments;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import java.util.Date;
45

56
/**
67
* @author besbes
78
* @since 05/03/2024 13:51
89
*/
910
public class VoiceCommentData {
1011

12+
private String from;
13+
private String to;
14+
private String recordingUrl;
1115
private Long callDuration;
16+
private Date startedAt;
17+
18+
@JsonProperty("from")
19+
public String getFrom() {
20+
return from;
21+
}
22+
23+
@JsonProperty("to")
24+
public String getTo() {
25+
return to;
26+
}
27+
28+
@JsonProperty("recording_url")
29+
public String getRecordingUrl() {
30+
return recordingUrl;
31+
}
1232

1333
@JsonProperty("call_duration")
1434
public Long getCallDuration() {
1535
return callDuration;
1636
}
37+
38+
@JsonProperty("started_at")
39+
public Date getStartedAt() {
40+
return startedAt;
41+
}
1742
}

src/test/java/org/zendesk/client/v2/RealSmokeTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2802,17 +2802,17 @@ public void getUnresolvedViewReturnsANewlyCreatedTicket() throws Exception {
28022802
Ticket ticket = instance.createTicket(newTestTicket());
28032803
try {
28042804
assertThat(ticket.getId(), notNullValue());
2805-
2806-
Optional<Ticket> maybeTicket =
2807-
StreamSupport.stream(instance.getView(UNRESOLVED_TICKETS_VIEW_ID).spliterator(), false)
2808-
.filter(t -> Objects.equals(t.getId(), ticket.getId()))
2809-
.findFirst();
2810-
assertTrue(maybeTicket.isPresent());
2805+
await().until(() -> lookForTicket(ticket));
28112806
} finally {
28122807
instance.deleteTicket(ticket.getId());
28132808
}
28142809
}
28152810

2811+
private boolean lookForTicket(Ticket ticket) {
2812+
return StreamSupport.stream(instance.getView(UNRESOLVED_TICKETS_VIEW_ID).spliterator(), false)
2813+
.anyMatch(t -> Objects.equals(t.getId(), ticket.getId()));
2814+
}
2815+
28162816
@Test
28172817
public void getViewReturnsTheUnresolvedView() throws Exception {
28182818
createClientWithTokenOrPassword();

0 commit comments

Comments
 (0)