Commit 3e8e99c
* Fix #12271: Detect year, country, and page numbers in booktitle
Enhance BooktitleChecker to flag booktitle values that contain:
- A 4-digit year (e.g. 2015)
- A country name (e.g. Norway, Austria, Singapore)
- Explicit page-number patterns (e.g. "pp. 1–10", "pages 3-7")
Add Countries.java with a hard-coded set of all UN-recognised country
names used for the country-presence check. The set is built as a single
pre-compiled regex alternation so the pattern is compiled only once.
Update BooktitleCheckerTest with parameterised tests covering all three
new integrity rules and the blank-value / valid-value edge cases.
Closes #12271
* Fix Countries.java javadoc to use /// style
* Add missing localization keys for booktitle integrity checks
* Address code review: split BooktitleChecker into focused checkers
- Extract year, country, and page-number checks into separate
ValueChecker classes (BooktitleContainsYearChecker,
BooktitleContainsCountryChecker, BooktitleContainsPagesChecker)
so all three issues in one booktitle are reported independently
- Fix word-boundary regex in country checker: replace [a-z]
lookarounds with \p{Alnum} so tokens like USA2015 are not
mis-flagged as locations
- Register all three new checkers in FieldCheckers for BOOKTITLE
- Strengthen tests: use assertEquals with exact expected message
instead of assertNotEquals(Optional.empty()); add regression
test for alphanumeric token false-positive
* Fix Checkstyle: use Pattern instead of Predicate<String> for compiled regexes
* Fix Checkstyle: put Pattern.compile on same line as static final declaration
* Retrigger CI
* refactor: use Locale API for country names, add region markers to tests
- Replace hard-coded country list in Countries.java with
Locale.getISOCountries() + getDisplayCountry() so no manual
maintenance is needed
- Use //region and //endregion in BooktitleCheckerTest for
better test organization
* fix: align stream chain to match IntelliJ formatter style
* fix: add space after // in region comments for Checkstyle
* refactor: inline country names into checker, remove Countries class
- Remove separate Countries.java utility class; inline the
Locale-derived country set directly into
BooktitleContainsCountryChecker
- Use Locale.of() instead of Locale.Builder (matches existing
JabRef convention in Language.java)
- Remove javadoc from new checkers to match existing checker
style (BracketChecker, TitleChecker, YearChecker have none)
* chore: retrigger CI after rebase
* chore: retrigger CI
* fix: use alphanumeric boundary for booktitle year regex
Previously the year regex used digit-only lookarounds, so tokens like
ICML2015 matched the 2015 and triggered a false positive. Switching the
boundary to \p{Alnum} mirrors the country checker and prevents matching
years that are embedded inside larger alphanumeric tokens.
Also adds a regression test and a CHANGELOG entry under [Unreleased].
---------
Co-authored-by: Subhramit Basu <subhramit.bb@live.in>
1 parent 69f0a94 commit 3e8e99c
7 files changed
Lines changed: 204 additions & 4 deletions
File tree
- jablib/src
- main
- java/org/jabref/logic/integrity
- resources/l10n
- test/java/org/jabref/logic/integrity
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| |||
Lines changed: 37 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
Lines changed: 23 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
Lines changed: 23 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
34 | 37 | | |
35 | 38 | | |
36 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1658 | 1658 | | |
1659 | 1659 | | |
1660 | 1660 | | |
| 1661 | + | |
| 1662 | + | |
| 1663 | + | |
1661 | 1664 | | |
1662 | 1665 | | |
1663 | 1666 | | |
| |||
Lines changed: 114 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
15 | 19 | | |
16 | 20 | | |
17 | 21 | | |
18 | | - | |
| 22 | + | |
19 | 23 | | |
20 | 24 | | |
21 | 25 | | |
22 | | - | |
23 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
24 | 29 | | |
25 | 30 | | |
26 | 31 | | |
27 | 32 | | |
28 | 33 | | |
29 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
30 | 140 | | |
0 commit comments