Skip to content

Commit 9af8112

Browse files
kohsukekohsuke
committed
Tightening up access control and use primitive type
1 parent a1819bf commit 9af8112

4 files changed

Lines changed: 51 additions & 38 deletions

File tree

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

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

6+
/**
7+
* Repository clone statistics.
8+
*
9+
* @see GHRepository#getClones()
10+
*/
611
public class GHRepositoryClones extends GHRepositoryTrafficInfo {
712
private List<DayClones> clones;
813

9-
public GHRepositoryClones() {
14+
/*package*/ GHRepositoryClones() {
1015
}
1116

12-
public GHRepositoryClones(Integer count, Integer uniques, List<DayClones> clones) {
17+
/*package*/ GHRepositoryClones(Integer count, Integer uniques, List<DayClones> clones) {
1318
super(count, uniques);
1419
this.clones = clones;
1520
}
@@ -18,15 +23,19 @@ public List<DayClones> getClones() {
1823
return clones;
1924
}
2025

26+
public List<DayClones> getDailyInfo() {
27+
return getClones();
28+
}
29+
2130
public static class DayClones extends GHRepositoryTrafficInfo.DayInfo {
22-
public DayClones() {
31+
/*package*/ DayClones() {
2332
}
2433

25-
public DayClones(String timestamp, Integer count, Integer uniques) {
34+
/*package*/ DayClones(String timestamp, int count, int uniques) {
2635
super(timestamp, count, uniques);
2736
}
2837

29-
public DayClones(Date timestamp, Integer count, Integer uniques) {
38+
/*package*/ DayClones(Date timestamp, int count, int uniques) {
3039
super(timestamp, count, uniques);
3140
}
3241
}

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

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

33
import java.util.Date;
4+
import java.util.List;
45

56
public abstract class GHRepositoryTrafficInfo {
6-
private Integer count;
7-
private Integer uniques;
7+
private int count;
8+
private int uniques;
89

9-
public GHRepositoryTrafficInfo() {
10+
/*package*/ GHRepositoryTrafficInfo() {
1011
}
1112

12-
public GHRepositoryTrafficInfo(Integer count, Integer uniques) {
13+
/*package*/ GHRepositoryTrafficInfo(int count, int uniques) {
1314
this.count = count;
1415
this.uniques = uniques;
1516
}
1617

17-
public Integer getCount() {
18+
public int getCount() {
1819
return count;
1920
}
2021

21-
public Integer getUniques() {
22+
public int getUniques() {
2223
return uniques;
2324
}
2425

26+
public abstract List<? extends DayInfo> getDailyInfo();
27+
2528
public static abstract class DayInfo {
2629
private Date timestamp;
27-
private Integer count;
28-
private Integer uniques;
30+
private int count;
31+
private int uniques;
2932

3033
public Date getTimestamp() {
3134
return timestamp;
3235
}
3336

34-
public Integer getCount() {
37+
public int getCount() {
3538
return count;
3639
}
3740

38-
public Integer getUniques() {
41+
public int getUniques() {
3942
return uniques;
4043
}
4144

42-
public DayInfo() {
45+
/*package*/ DayInfo() {
4346
}
4447

45-
public DayInfo(String timestamp, Integer count, Integer uniques) {
48+
/*package*/ DayInfo(String timestamp, Integer count, Integer uniques) {
4649
this.timestamp = GitHub.parseDate(timestamp);
4750
this.count = count;
4851
this.uniques = uniques;
4952
}
5053

51-
public DayInfo(Date timestamp, Integer count, Integer uniques) {
54+
/*package*/ DayInfo(Date timestamp, Integer count, Integer uniques) {
5255
this.timestamp = timestamp;
5356
this.count = count;
5457
this.uniques = uniques;

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

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

6+
/**
7+
* Repository view statistics.
8+
*
9+
* @see GHRepository#getViews()
10+
*/
611
public class GHRepositoryViews extends GHRepositoryTrafficInfo {
712
private List<DayViews> views;
813

9-
public GHRepositoryViews() {
14+
/*package*/ GHRepositoryViews() {
1015
}
1116

12-
public GHRepositoryViews(Integer count, Integer uniques, List<DayViews> views) {
17+
/*package*/ GHRepositoryViews(int count, int uniques, List<DayViews> views) {
1318
super(count, uniques);
1419
this.views = views;
1520
}
@@ -18,15 +23,19 @@ public List<DayViews> getViews() {
1823
return views;
1924
}
2025

26+
public List<DayViews> getDailyInfo() {
27+
return getViews();
28+
}
29+
2130
public static class DayViews extends GHRepositoryTrafficInfo.DayInfo {
22-
public DayViews() {
31+
/*package*/ DayViews() {
2332
}
2433

25-
public DayViews(String timestamp, Integer count, Integer uniques) {
34+
/*package*/ DayViews(String timestamp, int count, int uniques) {
2635
super(timestamp, count, uniques);
2736
}
2837

29-
public DayViews(Date timestamp, Integer count, Integer uniques) {
38+
/*package*/ DayViews(Date timestamp, int count, int uniques) {
3039
super(timestamp, count, uniques);
3140
}
3241
}

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.apache.commons.io.IOUtils;
55
import org.junit.Assert;
66
import org.junit.Test;
7+
import org.kohsuke.github.GHRepositoryTrafficInfo.DayInfo;
78
import org.mockito.Mockito;
89

910
import java.io.IOException;
@@ -24,27 +25,18 @@ private <T extends GHRepositoryTrafficInfo> void checkResponse(T expected, T act
2425
Assert.assertEquals(expected.getCount(), actual.getCount());
2526
Assert.assertEquals(expected.getUniques(), actual.getUniques());
2627

27-
List<T.DayInfo> expectedList = null;
28-
List<T.DayInfo> actualList = null;
29-
Iterator<T.DayInfo> expectedIt;
30-
Iterator<T.DayInfo> actualIt;
31-
32-
if(expected instanceof GHRepositoryViews){
33-
expectedList = (List<T.DayInfo>)((List<?>)((GHRepositoryViews) expected).getViews());
34-
actualList = (List<T.DayInfo>)((List<?>)((GHRepositoryViews) actual).getViews());
35-
}
36-
else if(expected instanceof GHRepositoryClones){
37-
expectedList = (List<T.DayInfo>)((List<?>)((GHRepositoryClones) expected).getClones());
38-
actualList = (List<T.DayInfo>)((List<?>)((GHRepositoryClones) actual).getClones());
39-
}
28+
List<? extends DayInfo> expectedList = expected.getDailyInfo();
29+
List<? extends DayInfo> actualList = actual.getDailyInfo();
30+
Iterator<? extends DayInfo> expectedIt;
31+
Iterator<? extends DayInfo> actualIt;
4032

4133
Assert.assertEquals(expectedList.size(), actualList.size());
4234
expectedIt = expectedList.iterator();
4335
actualIt = actualList.iterator();
4436

4537
while(expectedIt.hasNext() && actualIt.hasNext()) {
46-
T.DayInfo expectedDayInfo = expectedIt.next();
47-
T.DayInfo actualDayInfo = actualIt.next();
38+
DayInfo expectedDayInfo = expectedIt.next();
39+
DayInfo actualDayInfo = actualIt.next();
4840
Assert.assertEquals(expectedDayInfo.getCount(), actualDayInfo.getCount());
4941
Assert.assertEquals(expectedDayInfo.getUniques(), actualDayInfo.getUniques());
5042
Assert.assertEquals(expectedDayInfo.getTimestamp(), actualDayInfo.getTimestamp());

0 commit comments

Comments
 (0)