Skip to content

Commit 8accf07

Browse files
committed
Changed timestamp (GHRepositoryViews.DayViews.timestamp) field type from String to Date.
1 parent 6dcbace commit 8accf07

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

src/main/java/org/kohsuke/github/GHRepositoryViews.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.kohsuke.github;
22

3+
import java.util.Date;
34
import java.util.List;
45

56
public class GHRepositoryViews{
@@ -29,11 +30,11 @@ public List<DayViews> getViews() {
2930
}
3031

3132
public static class DayViews {
32-
private String timestamp;
33+
private Date timestamp;
3334
private Integer count;
3435
private Integer uniques;
3536

36-
public String getTimestamp() {
37+
public Date getTimestamp() {
3738
return timestamp;
3839
}
3940

@@ -49,6 +50,12 @@ public DayViews() {
4950
}
5051

5152
public DayViews(String timestamp, Integer count, Integer uniques) {
53+
this.timestamp = GitHub.parseDate(timestamp);
54+
this.count = count;
55+
this.uniques = uniques;
56+
}
57+
58+
public DayViews(Date timestamp, Integer count, Integer uniques) {
5259
this.timestamp = timestamp;
5360
this.count = count;
5461
this.uniques = uniques;

src/test/java/org/kohsuke/github/RepositoryTrafficMockTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.kohsuke.github;
22

3+
import com.fasterxml.jackson.databind.ObjectMapper;
34
import org.apache.commons.io.IOUtils;
45
import org.junit.Assert;
56
import org.junit.Test;
@@ -9,8 +10,10 @@
910
import java.io.InputStream;
1011
import java.net.HttpURLConnection;
1112
import java.net.URL;
13+
import java.text.SimpleDateFormat;
1214
import java.util.Arrays;
1315
import java.util.Iterator;
16+
import java.util.TimeZone;
1417

1518
public class RepositoryTrafficMockTest {
1619
final private String login = "kohsuke", repositoryName = "github-api";
@@ -53,7 +56,11 @@ public void getViews() throws IOException{
5356
new GHRepositoryViews.DayViews("2016-10-24T00:00:00Z", 614,237)
5457
)
5558
);
56-
String mockedGHRepositoryViewsResponse = GitHub.MAPPER.writeValueAsString(expectedResult);
59+
SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
60+
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
61+
ObjectMapper mapper = new ObjectMapper().setDateFormat(dateFormat);
62+
String mockedGHRepositoryViewsResponse = mapper.writeValueAsString(expectedResult);
63+
5764

5865
GitHub gitHub = GitHub.connect(login, null);
5966
GitHub gitHubSpy = Mockito.spy(gitHub);

0 commit comments

Comments
 (0)