Skip to content

Commit c7403f7

Browse files
author
afbernardino
committed
Rename getCitizen to extractCitizen
1 parent 36c7cde commit c7403f7

26 files changed

Lines changed: 144 additions & 144 deletions

‎src/main/java/com/github/reducktion/socrates/Socrates.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public boolean validateId(final String id, final Country country) {
3636
*/
3737
public Optional<Citizen> extractCitizenFromId(final String id, final Country country) {
3838
final NationalId nationalId = NationalIdFactory.getNationalId(id, country);
39-
return nationalId.getCitizen();
39+
return nationalId.extractCitizen();
4040
}
4141

4242
/**

‎src/main/java/com/github/reducktion/socrates/nationalid/BelgiumNationalId.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,24 @@ public boolean isValid() {
4949
}
5050

5151
private boolean hasValidSequenceNumber() {
52-
final int sequenceNumber = getSequenceNumber();
52+
final int sequenceNumber = extractSequenceNumber();
5353
return sequenceNumber != 0 && sequenceNumber != 999; // range from 001 to 998
5454
}
5555

56-
private int getSequenceNumber() {
56+
private int extractSequenceNumber() {
5757
return Integer.parseInt(sanitizedId.substring(6, 9));
5858
}
5959

6060
private boolean hasValidChecksum(final boolean y2k) {
61-
final String input = (y2k ? "2" : "") + getY2kChecksumCharacters();
62-
return getChecksum() == computeChecksum(input);
61+
final String input = (y2k ? "2" : "") + extractY2kChecksumCharacters();
62+
return extractChecksum() == computeChecksum(input);
6363
}
6464

65-
private String getY2kChecksumCharacters() {
65+
private String extractY2kChecksumCharacters() {
6666
return sanitizedId.substring(0, 9);
6767
}
6868

69-
private int getChecksum() {
69+
private int extractChecksum() {
7070
return Integer.parseInt(sanitizedId.substring(9));
7171
}
7272

@@ -75,9 +75,9 @@ private long computeChecksum(final String input) {
7575
}
7676

7777
private boolean hasValidBirthOfDate(final boolean y2k) {
78-
int year = Integer.parseInt(getYearOfBirthCharacters());
79-
final int month = Integer.parseInt(getMonthOfBirthCharacters());
80-
final int day = Integer.parseInt(getDayOfBirthCharacters());
78+
int year = Integer.parseInt(extractYearOfBirthCharacters());
79+
final int month = Integer.parseInt(extractMonthOfBirthCharacters());
80+
final int day = Integer.parseInt(extractDayOfBirthCharacters());
8181

8282
if (month > 12 || day > 31) {
8383
return false;
@@ -87,54 +87,54 @@ private boolean hasValidBirthOfDate(final boolean y2k) {
8787
return DateValidator.validate(year, month, day);
8888
}
8989

90-
private String getYearOfBirthCharacters() {
90+
private String extractYearOfBirthCharacters() {
9191
return sanitizedId.substring(0, 2);
9292
}
9393

9494
// returns "00" if the month of birth is unknown
95-
private String getMonthOfBirthCharacters() {
95+
private String extractMonthOfBirthCharacters() {
9696
return sanitizedId.substring(2, 4);
9797
}
9898

9999
// returns "00" if the day of birth is unknown
100-
private String getDayOfBirthCharacters() {
100+
private String extractDayOfBirthCharacters() {
101101
return sanitizedId.substring(4, 6);
102102
}
103103

104104
@Override
105-
public Optional<Citizen> getCitizen() {
105+
public Optional<Citizen> extractCitizen() {
106106
if (!isValid()) {
107107
return Optional.empty();
108108
}
109109

110110
return Optional.of(
111111
Citizen
112112
.builder()
113-
.gender(getGender())
114-
.yearOfBirth(getYearOfBirth())
115-
.monthOfBirth(getMonthOfBirth())
116-
.dayOfBirth(getDayOfBirth())
113+
.gender(extractGender())
114+
.yearOfBirth(extractYearOfBirth())
115+
.monthOfBirth(extractMonthOfBirth())
116+
.dayOfBirth(extractDayOfBirth())
117117
.build()
118118
);
119119
}
120120

121-
private Gender getGender() {
122-
final int sequenceNumber = getSequenceNumber();
121+
private Gender extractGender() {
122+
final int sequenceNumber = extractSequenceNumber();
123123
return sequenceNumber % 2 == 0 ? Gender.FEMALE : Gender.MALE;
124124
}
125125

126-
private Integer getYearOfBirth() {
127-
final boolean y2k = getChecksum() != computeChecksum(getY2kChecksumCharacters());
128-
return Integer.parseInt((y2k ? "20" : "19") + getYearOfBirthCharacters());
126+
private Integer extractYearOfBirth() {
127+
final boolean y2k = extractChecksum() != computeChecksum(extractY2kChecksumCharacters());
128+
return Integer.parseInt((y2k ? "20" : "19") + extractYearOfBirthCharacters());
129129
}
130130

131-
private Integer getMonthOfBirth() {
132-
final String monthOfBirthCharacters = getMonthOfBirthCharacters();
131+
private Integer extractMonthOfBirth() {
132+
final String monthOfBirthCharacters = extractMonthOfBirthCharacters();
133133
return "00".equals(monthOfBirthCharacters) ? null : Integer.parseInt(monthOfBirthCharacters);
134134
}
135135

136-
private Integer getDayOfBirth() {
137-
final String dayOfBirthCharacters = getDayOfBirthCharacters();
136+
private Integer extractDayOfBirth() {
137+
final String dayOfBirthCharacters = extractDayOfBirthCharacters();
138138
return "00".equals(dayOfBirthCharacters) ? null : Integer.parseInt(dayOfBirthCharacters);
139139
}
140140

‎src/main/java/com/github/reducktion/socrates/nationalid/BrazilNationalId.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private boolean validateChecksum() {
5858
}
5959

6060
@Override
61-
public Optional<Citizen> getCitizen() {
61+
public Optional<Citizen> extractCitizen() {
6262
return Optional.empty();
6363
}
6464

‎src/main/java/com/github/reducktion/socrates/nationalid/CanadaNationalId.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private boolean hasValidSequence() {
4141
}
4242

4343
@Override
44-
public Optional<Citizen> getCitizen() {
44+
public Optional<Citizen> extractCitizen() {
4545
return Optional.empty();
4646
}
4747

‎src/main/java/com/github/reducktion/socrates/nationalid/DenmarkNationalId.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ && hasValidDateOfBirth()
3939
}
4040

4141
private boolean hasValidDateOfBirth() {
42-
final Integer year = getYearOfBirth();
43-
final Integer month = getMonthOfBirth();
44-
final Integer day = getDayOfBirth();
42+
final Integer year = extractYearOfBirth();
43+
final Integer month = extractMonthOfBirth();
44+
final Integer day = extractDayOfBirth();
4545

4646
if (year == null || month == null || day == null) {
4747
return false;
@@ -59,7 +59,7 @@ private boolean hasValidChecksum() {
5959
return sum % 11 == 0;
6060
}
6161

62-
private Integer getYearOfBirth() {
62+
private Integer extractYearOfBirth() {
6363
if (sanitizedId == null) {
6464
return null;
6565
}
@@ -87,15 +87,15 @@ private Integer getYearOfBirth() {
8787
return century + twoDigitsYear;
8888
}
8989

90-
private Integer getMonthOfBirth() {
90+
private Integer extractMonthOfBirth() {
9191
if (sanitizedId == null) {
9292
return null;
9393
}
9494

9595
return Integer.parseInt(sanitizedId.substring(2, 4));
9696
}
9797

98-
private Integer getDayOfBirth() {
98+
private Integer extractDayOfBirth() {
9999
if (sanitizedId == null) {
100100
return null;
101101
}
@@ -104,22 +104,22 @@ private Integer getDayOfBirth() {
104104
}
105105

106106
@Override
107-
public Optional<Citizen> getCitizen() {
107+
public Optional<Citizen> extractCitizen() {
108108
if (!isValid()) {
109109
return Optional.empty();
110110
}
111111

112112
return Optional.of(
113113
Citizen.builder()
114-
.gender(getGender())
115-
.yearOfBirth(getYearOfBirth())
116-
.monthOfBirth(getMonthOfBirth())
117-
.dayOfBirth(getDayOfBirth())
114+
.gender(extractGender())
115+
.yearOfBirth(extractYearOfBirth())
116+
.monthOfBirth(extractMonthOfBirth())
117+
.dayOfBirth(extractDayOfBirth())
118118
.build()
119119
);
120120
}
121121

122-
private Gender getGender() {
122+
private Gender extractGender() {
123123
if (sanitizedId == null) {
124124
return null;
125125
}

‎src/main/java/com/github/reducktion/socrates/nationalid/FranceNationalId.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,37 +75,37 @@ private long getControlDigit() {
7575
}
7676

7777
@Override
78-
public Optional<Citizen> getCitizen() {
78+
public Optional<Citizen> extractCitizen() {
7979
if (!isValid()) {
8080
return Optional.empty();
8181
}
8282

8383
return Optional.of(
8484
Citizen
8585
.builder()
86-
.gender(getGender())
87-
.yearOfBirth(getYearOfBirth())
88-
.monthOfBirth(getMonthOfBirth())
89-
.placeOfBirth(getPlaceOfBirth())
86+
.gender(extractGender())
87+
.yearOfBirth(extractYearOfBirth())
88+
.monthOfBirth(extractMonthOfBirth())
89+
.placeOfBirth(extractPlaceOfBirth())
9090
.build()
9191
);
9292
}
9393

94-
private Gender getGender() {
94+
private Gender extractGender() {
9595
if (CHARACTER_MALE.equals(sanitizedId.substring(0, 1))) {
9696
return Gender.MALE;
9797
} else {
9898
return Gender.FEMALE;
9999
}
100100
}
101101

102-
private Integer getYearOfBirth() {
102+
private Integer extractYearOfBirth() {
103103
return twoYearDateParser
104104
.parse(sanitizedId.substring(1, 3))
105105
.orElse(null);
106106
}
107107

108-
private Integer getMonthOfBirth() {
108+
private Integer extractMonthOfBirth() {
109109
final int month = Integer.parseInt(sanitizedId.substring(3, 5));
110110

111111
if (month >= JANUARY && month <= DECEMBER) {
@@ -117,7 +117,7 @@ private Integer getMonthOfBirth() {
117117
}
118118
}
119119

120-
private String getPlaceOfBirth() {
120+
private String extractPlaceOfBirth() {
121121
final String placeOfBirthTwoCharacters = sanitizedId.substring(5, 7);
122122
final String placeOfBirthThreeCharacters = sanitizedId.substring(5, 8);
123123

‎src/main/java/com/github/reducktion/socrates/nationalid/GermanyNationalId.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private boolean hasValidChecksum() {
8787
* </a>
8888
*/
8989
private String computeCheckDigit() {
90-
final String idNr = getIdNr();
90+
final String idNr = extractIdNr();
9191
final int ten = 10;
9292
final int eleven = 11;
9393
final char[] chars = idNr.toCharArray();
@@ -115,7 +115,7 @@ private String computeCheckDigit() {
115115
*
116116
* @return the IdNr, which is a string consisting of ten numeric digits
117117
*/
118-
private String getIdNr() {
118+
private String extractIdNr() {
119119
return sanitizedId.substring(0, 10);
120120
}
121121

@@ -127,13 +127,13 @@ private boolean hasMoreThan3EqualDigits() {
127127
}
128128

129129
private Map<String, Long> computeDigitFrequency() {
130-
final String idNr = getIdNr();
130+
final String idNr = extractIdNr();
131131
return idNr.chars().mapToObj(String::valueOf)
132132
.collect(groupingBy(Function.identity(), counting()));
133133
}
134134

135135
private boolean hasThreeOrMoreConsecutiveDigits() {
136-
final String idNr = getIdNr();
136+
final String idNr = extractIdNr();
137137
int counter = 0;
138138
char lastChar = '?';
139139
for (final char c : idNr.toCharArray()) {
@@ -151,7 +151,7 @@ private boolean hasThreeOrMoreConsecutiveDigits() {
151151
}
152152

153153
@Override
154-
public Optional<Citizen> getCitizen() {
154+
public Optional<Citizen> extractCitizen() {
155155
return Optional.empty();
156156
}
157157

‎src/main/java/com/github/reducktion/socrates/nationalid/ItalyNationalId.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,25 +121,25 @@ private String getRemainderCharacterForValue(final int value) {
121121
}
122122

123123
@Override
124-
public Optional<Citizen> getCitizen() {
124+
public Optional<Citizen> extractCitizen() {
125125
if (!isValid()) {
126126
return Optional.empty();
127127
}
128128

129129
return Optional.of(
130130
Citizen
131131
.builder()
132-
.gender(getGender())
133-
.yearOfBirth(getYearOfBirth())
134-
.monthOfBirth(getMonthOfBirth())
135-
.dayOfBirth(getDayOfBirth())
136-
.placeOfBirth(getPlaceOfBirth())
132+
.gender(extractGender())
133+
.yearOfBirth(extractYearOfBirth())
134+
.monthOfBirth(extractMonthOfBirth())
135+
.dayOfBirth(extractDayOfBirth())
136+
.placeOfBirth(extractPlaceOfBirth())
137137
.build()
138138
);
139139
}
140140

141-
private Gender getGender() {
142-
final String dayOfBirthCharacters = getDayOfBirthCharacters();
141+
private Gender extractGender() {
142+
final String dayOfBirthCharacters = extractDayOfBirthCharacters();
143143

144144
if (Integer.parseInt(dayOfBirthCharacters) > 40) {
145145
return Gender.FEMALE;
@@ -148,39 +148,39 @@ private Gender getGender() {
148148
}
149149
}
150150

151-
private String getDayOfBirthCharacters() {
151+
private String extractDayOfBirthCharacters() {
152152
return sanitizedId.substring(9, 11);
153153
}
154154

155-
private Integer getYearOfBirth() {
155+
private Integer extractYearOfBirth() {
156156
final String yearOfBirthCharacters = sanitizedId.substring(6, 8);
157157
return twoYearDateParser
158158
.parse(yearOfBirthCharacters)
159159
.orElse(null);
160160
}
161161

162-
private Integer getMonthOfBirth() {
162+
private Integer extractMonthOfBirth() {
163163
final String monthOfBirthCharacter = sanitizedId.substring(8, 9);
164164

165165
return MONTH_CODES.indexOf(monthOfBirthCharacter) + 1;
166166
}
167167

168-
private Integer getDayOfBirth() {
169-
final String dayOfBirthCharacter = getDayOfBirthCharacters();
168+
private Integer extractDayOfBirth() {
169+
final String dayOfBirthCharacter = extractDayOfBirthCharacters();
170170
final int dayOfBirth = Integer.parseInt(dayOfBirthCharacter);
171171

172172
return dayOfBirth > 40 ? dayOfBirth - 40 : dayOfBirth;
173173
}
174174

175-
private String getPlaceOfBirth() {
176-
final String placeOfBirthCharacter = getPlaceOfBirthCharacters();
175+
private String extractPlaceOfBirth() {
176+
final String placeOfBirthCharacter = extractPlaceOfBirthCharacters();
177177

178178
final Optional<String> placeOfBirthConfig = fetchPlaceOfBirthConfig(placeOfBirthCharacter);
179179

180180
return placeOfBirthConfig.map(c -> c.split(",")[1]).orElse(null);
181181
}
182182

183-
private String getPlaceOfBirthCharacters() {
183+
private String extractPlaceOfBirthCharacters() {
184184
return sanitizedId.substring(11, 15);
185185
}
186186

0 commit comments

Comments
 (0)