Skip to content

Commit 635350c

Browse files
kohsukekohsuke
committed
Additional naming consistency change
1 parent 17edd33 commit 635350c

4 files changed

Lines changed: 66 additions & 84 deletions

File tree

‎src/main/java/org/kohsuke/github/GHRepositoryCloneTraffic.java‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
11
package org.kohsuke.github;
22

3-
import java.util.Date;
43
import java.util.List;
54

65
/**
76
* Repository clone statistics.
87
*
98
* @see GHRepository#getCloneTraffic()
109
*/
11-
public class GHRepositoryCloneTraffic extends GHRepositoryTrafficInfo {
12-
private List<DayInfo> clones;
10+
public class GHRepositoryCloneTraffic extends GHRepositoryTraffic {
11+
private List<DailyInfo> clones;
1312

1413
/*package*/ GHRepositoryCloneTraffic() {
1514
}
1615

17-
/*package*/ GHRepositoryCloneTraffic(Integer count, Integer uniques, List<DayInfo> clones) {
16+
/*package*/ GHRepositoryCloneTraffic(Integer count, Integer uniques, List<DailyInfo> clones) {
1817
super(count, uniques);
1918
this.clones = clones;
2019
}
2120

22-
public List<DayInfo> getClones() {
21+
public List<DailyInfo> getClones() {
2322
return clones;
2423
}
2524

26-
public List<DayInfo> getDailyInfo() {
25+
public List<DailyInfo> getDailyInfo() {
2726
return getClones();
2827
}
2928

30-
public static class DayInfo extends GHRepositoryTrafficInfo.DayInfo {
31-
/*package*/ DayInfo() {
29+
public static class DailyInfo extends GHRepositoryTraffic.DailyInfo {
30+
/*package*/ DailyInfo() {
3231
}
3332

34-
/*package*/ DayInfo(String timestamp, int count, int uniques) {
35-
super(timestamp, count, uniques);
36-
}
37-
38-
/*package*/ DayInfo(Date timestamp, int count, int uniques) {
33+
/*package*/ DailyInfo(String timestamp, int count, int uniques) {
3934
super(timestamp, count, uniques);
4035
}
4136
}

src/main/java/org/kohsuke/github/GHRepositoryTrafficInfo.java renamed to src/main/java/org/kohsuke/github/GHRepositoryTraffic.java

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import java.util.Date;
44
import java.util.List;
55

6-
public abstract class GHRepositoryTrafficInfo implements TrafficInfo {
6+
public abstract class GHRepositoryTraffic implements TrafficInfo {
77
private int count;
88
private int uniques;
99

10-
/*package*/ GHRepositoryTrafficInfo() {
10+
/*package*/ GHRepositoryTraffic() {
1111
}
1212

13-
/*package*/ GHRepositoryTrafficInfo(int count, int uniques) {
13+
/*package*/ GHRepositoryTraffic(int count, int uniques) {
1414
this.count = count;
1515
this.uniques = uniques;
1616
}
@@ -23,15 +23,15 @@ public int getUniques() {
2323
return uniques;
2424
}
2525

26-
public abstract List<? extends DayInfo> getDailyInfo();
26+
public abstract List<? extends DailyInfo> getDailyInfo();
2727

28-
public static abstract class DayInfo implements TrafficInfo {
29-
private Date timestamp;
28+
public static abstract class DailyInfo implements TrafficInfo {
29+
private String timestamp;
3030
private int count;
3131
private int uniques;
3232

3333
public Date getTimestamp() {
34-
return timestamp;
34+
return GitHub.parseDate(timestamp);
3535
}
3636

3737
public int getCount() {
@@ -42,16 +42,10 @@ public int getUniques() {
4242
return uniques;
4343
}
4444

45-
/*package*/ DayInfo() {
45+
/*package*/ DailyInfo() {
4646
}
4747

48-
/*package*/ DayInfo(String timestamp, Integer count, Integer uniques) {
49-
this.timestamp = GitHub.parseDate(timestamp);
50-
this.count = count;
51-
this.uniques = uniques;
52-
}
53-
54-
/*package*/ DayInfo(Date timestamp, Integer count, Integer uniques) {
48+
/*package*/ DailyInfo(String timestamp, Integer count, Integer uniques) {
5549
this.timestamp = timestamp;
5650
this.count = count;
5751
this.uniques = uniques;

‎src/main/java/org/kohsuke/github/GHRepositoryViewTraffic.java‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
11
package org.kohsuke.github;
22

3-
import java.util.Date;
43
import java.util.List;
54

65
/**
76
* Repository view statistics.
87
*
98
* @see GHRepository#getViewTraffic()
109
*/
11-
public class GHRepositoryViewTraffic extends GHRepositoryTrafficInfo {
12-
private List<Daily> views;
10+
public class GHRepositoryViewTraffic extends GHRepositoryTraffic {
11+
private List<DailyInfo> views;
1312

1413
/*package*/ GHRepositoryViewTraffic() {
1514
}
1615

17-
/*package*/ GHRepositoryViewTraffic(int count, int uniques, List<Daily> views) {
16+
/*package*/ GHRepositoryViewTraffic(int count, int uniques, List<DailyInfo> views) {
1817
super(count, uniques);
1918
this.views = views;
2019
}
2120

22-
public List<Daily> getViews() {
21+
public List<DailyInfo> getViews() {
2322
return views;
2423
}
2524

26-
public List<Daily> getDailyInfo() {
25+
public List<DailyInfo> getDailyInfo() {
2726
return getViews();
2827
}
2928

30-
public static class Daily extends GHRepositoryTrafficInfo.DayInfo {
31-
/*package*/ Daily() {
29+
public static class DailyInfo extends GHRepositoryTraffic.DailyInfo {
30+
/*package*/ DailyInfo() {
3231
}
3332

34-
/*package*/ Daily(String timestamp, int count, int uniques) {
35-
super(timestamp, count, uniques);
36-
}
37-
38-
/*package*/ Daily(Date timestamp, int count, int uniques) {
33+
/*package*/ DailyInfo(String timestamp, int count, int uniques) {
3934
super(timestamp, count, uniques);
4035
}
4136
}

‎src/test/java/org/kohsuke/github/RepositoryTrafficTest.java‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import org.apache.commons.io.IOUtils;
55
import org.junit.Assert;
66
import org.junit.Test;
7-
import org.kohsuke.github.GHRepositoryCloneTraffic.DayInfo;
8-
import org.kohsuke.github.GHRepositoryViewTraffic.Daily;
97
import org.mockito.Mockito;
108

119
import java.io.IOException;
@@ -22,29 +20,29 @@ public class RepositoryTrafficTest {
2220
final private String login = "kohsuke", repositoryName = "github-api";
2321

2422
@SuppressWarnings("unchecked")
25-
private <T extends GHRepositoryTrafficInfo> void checkResponse(T expected, T actual){
23+
private <T extends GHRepositoryTraffic> void checkResponse(T expected, T actual){
2624
Assert.assertEquals(expected.getCount(), actual.getCount());
2725
Assert.assertEquals(expected.getUniques(), actual.getUniques());
2826

29-
List<? extends GHRepositoryTrafficInfo.DayInfo> expectedList = expected.getDailyInfo();
30-
List<? extends GHRepositoryTrafficInfo.DayInfo> actualList = actual.getDailyInfo();
31-
Iterator<? extends GHRepositoryTrafficInfo.DayInfo> expectedIt;
32-
Iterator<? extends GHRepositoryTrafficInfo.DayInfo> actualIt;
27+
List<? extends DailyInfo> expectedList = expected.getDailyInfo();
28+
List<? extends DailyInfo> actualList = actual.getDailyInfo();
29+
Iterator<? extends DailyInfo> expectedIt;
30+
Iterator<? extends DailyInfo> actualIt;
3331

3432
Assert.assertEquals(expectedList.size(), actualList.size());
3533
expectedIt = expectedList.iterator();
3634
actualIt = actualList.iterator();
3735

3836
while(expectedIt.hasNext() && actualIt.hasNext()) {
39-
GHRepositoryTrafficInfo.DayInfo expectedDayInfo = expectedIt.next();
40-
GHRepositoryTrafficInfo.DayInfo actualDayInfo = actualIt.next();
41-
Assert.assertEquals(expectedDayInfo.getCount(), actualDayInfo.getCount());
42-
Assert.assertEquals(expectedDayInfo.getUniques(), actualDayInfo.getUniques());
43-
Assert.assertEquals(expectedDayInfo.getTimestamp(), actualDayInfo.getTimestamp());
37+
DailyInfo expectedDailyInfo = expectedIt.next();
38+
DailyInfo actualDailyInfo = actualIt.next();
39+
Assert.assertEquals(expectedDailyInfo.getCount(), actualDailyInfo.getCount());
40+
Assert.assertEquals(expectedDailyInfo.getUniques(), actualDailyInfo.getUniques());
41+
Assert.assertEquals(expectedDailyInfo.getTimestamp(), actualDailyInfo.getTimestamp());
4442
}
4543
}
4644

47-
private <T extends GHRepositoryTrafficInfo> void testTraffic(T expectedResult) throws IOException{
45+
private <T extends GHRepositoryTraffic> void testTraffic(T expectedResult) throws IOException{
4846
SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
4947
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
5048
ObjectMapper mapper = new ObjectMapper().setDateFormat(dateFormat);
@@ -101,21 +99,21 @@ public void testGetViews() throws IOException{
10199
21523359,
102100
65534,
103101
Arrays.asList(
104-
new Daily("2016-10-10T00:00:00Z", 3, 2),
105-
new Daily("2016-10-11T00:00:00Z", 9, 4),
106-
new Daily("2016-10-12T00:00:00Z", 27, 8),
107-
new Daily("2016-10-13T00:00:00Z", 81, 16),
108-
new Daily("2016-10-14T00:00:00Z", 243, 32),
109-
new Daily("2016-10-15T00:00:00Z", 729, 64),
110-
new Daily("2016-10-16T00:00:00Z", 2187, 128),
111-
new Daily("2016-10-17T00:00:00Z", 6561, 256),
112-
new Daily("2016-10-18T00:00:00Z", 19683, 512),
113-
new Daily("2016-10-19T00:00:00Z", 59049, 1024),
114-
new Daily("2016-10-20T00:00:00Z", 177147, 2048),
115-
new Daily("2016-10-21T00:00:00Z", 531441, 4096),
116-
new Daily("2016-10-22T00:00:00Z", 1594323, 8192),
117-
new Daily("2016-10-23T00:00:00Z", 4782969, 16384),
118-
new Daily("2016-10-24T00:00:00Z", 14348907, 32768)
102+
new GHRepositoryViewTraffic.DailyInfo("2016-10-10T00:00:00Z", 3, 2),
103+
new GHRepositoryViewTraffic.DailyInfo("2016-10-11T00:00:00Z", 9, 4),
104+
new GHRepositoryViewTraffic.DailyInfo("2016-10-12T00:00:00Z", 27, 8),
105+
new GHRepositoryViewTraffic.DailyInfo("2016-10-13T00:00:00Z", 81, 16),
106+
new GHRepositoryViewTraffic.DailyInfo("2016-10-14T00:00:00Z", 243, 32),
107+
new GHRepositoryViewTraffic.DailyInfo("2016-10-15T00:00:00Z", 729, 64),
108+
new GHRepositoryViewTraffic.DailyInfo("2016-10-16T00:00:00Z", 2187, 128),
109+
new GHRepositoryViewTraffic.DailyInfo("2016-10-17T00:00:00Z", 6561, 256),
110+
new GHRepositoryViewTraffic.DailyInfo("2016-10-18T00:00:00Z", 19683, 512),
111+
new GHRepositoryViewTraffic.DailyInfo("2016-10-19T00:00:00Z", 59049, 1024),
112+
new GHRepositoryViewTraffic.DailyInfo("2016-10-20T00:00:00Z", 177147, 2048),
113+
new GHRepositoryViewTraffic.DailyInfo("2016-10-21T00:00:00Z", 531441, 4096),
114+
new GHRepositoryViewTraffic.DailyInfo("2016-10-22T00:00:00Z", 1594323, 8192),
115+
new GHRepositoryViewTraffic.DailyInfo("2016-10-23T00:00:00Z", 4782969, 16384),
116+
new GHRepositoryViewTraffic.DailyInfo("2016-10-24T00:00:00Z", 14348907, 32768)
119117
)
120118
);
121119
testTraffic(expectedResult);
@@ -127,21 +125,21 @@ public void testGetClones() throws IOException{
127125
1500,
128126
455,
129127
Arrays.asList(
130-
new DayInfo("2016-10-10T00:00:00Z", 10,3),
131-
new DayInfo("2016-10-11T00:00:00Z", 20,6),
132-
new DayInfo("2016-10-12T00:00:00Z", 30,5),
133-
new DayInfo("2016-10-13T00:00:00Z", 40,7),
134-
new DayInfo("2016-10-14T00:00:00Z", 50,11),
135-
new DayInfo("2016-10-15T00:00:00Z", 60,12),
136-
new DayInfo("2016-10-16T00:00:00Z", 70,19),
137-
new DayInfo("2016-10-17T00:00:00Z", 170,111),
138-
new DayInfo("2016-10-18T00:00:00Z", 180,70),
139-
new DayInfo("2016-10-19T00:00:00Z", 190,10),
140-
new DayInfo("2016-10-20T00:00:00Z", 200,18),
141-
new DayInfo("2016-10-21T00:00:00Z", 210,8),
142-
new DayInfo("2016-10-22T00:00:00Z", 220,168),
143-
new DayInfo("2016-10-23T00:00:00Z", 5,2),
144-
new DayInfo("2016-10-24T00:00:00Z", 45,5)
128+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-10T00:00:00Z", 10,3),
129+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-11T00:00:00Z", 20,6),
130+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-12T00:00:00Z", 30,5),
131+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-13T00:00:00Z", 40,7),
132+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-14T00:00:00Z", 50,11),
133+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-15T00:00:00Z", 60,12),
134+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-16T00:00:00Z", 70,19),
135+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-17T00:00:00Z", 170,111),
136+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-18T00:00:00Z", 180,70),
137+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-19T00:00:00Z", 190,10),
138+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-20T00:00:00Z", 200,18),
139+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-21T00:00:00Z", 210,8),
140+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-22T00:00:00Z", 220,168),
141+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-23T00:00:00Z", 5,2),
142+
new GHRepositoryCloneTraffic.DailyInfo("2016-10-24T00:00:00Z", 45,5)
145143
)
146144
);
147145
testTraffic(expectedResult);

0 commit comments

Comments
 (0)