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
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
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
|
diff --git a/z_e b/z_e
index 8d8786f..7888356 100644
--- a/z_e
+++ b/z_e
@@ -20,6 +20,7 @@
package org.jsonschema2pojo.util;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -36,76 +37,81 @@
private static final Pattern UNDERSCORE_PATTERN_1 = Pattern.compile("([A-Z]+)([A-Z][a-z])");
private static final Pattern UNDERSCORE_PATTERN_2 = Pattern.compile("([a-z\\d])([A-Z])");
- private List<RuleAndReplacement> plurals = new ArrayList<RuleAndReplacement>();
- private List<RuleAndReplacement> singulars = new ArrayList<RuleAndReplacement>();
- private List<String> uncountables = new ArrayList<String>();
+ private final List<RuleAndReplacement> plurals;
+ private final List<RuleAndReplacement> singulars;
+ private final List<String> uncountables;
- private static Inflector instance = new Inflector();
+ private static Inflector instance = createDefaultBuilder().build();
- private Inflector() {
- // Woo, you can't touch me.
-
- initialize();
+ private Inflector(Builder builder) {
+ plurals = Collections.unmodifiableList(builder.plurals);
+ singulars = Collections.unmodifiableList(builder.singulars);
+ uncountables = Collections.unmodifiableList(builder.uncountables);
}
- private void initialize() {
- plural("$", "s");
- plural("s$", "s");
- plural("(ax|test)is$", "$1es");
- plural("(octop|vir)us$", "$1i");
- plural("(alias|status)$", "$1es");
- plural("(bu)s$", "$1es");
- plural("(buffal|tomat)o$", "$1oes");
- plural("([ti])um$", "$1a");
- plural("sis$", "ses");
- plural("(?:([^f])fe|([lr])f)$", "$1$2ves");
- plural("(hive)$", "$1s");
- plural("([^aeiouy]|qu)y$", "$1ies");
- plural("([^aeiouy]|qu)ies$", "$1y");
- plural("(x|ch|ss|sh)$", "$1es");
- plural("(matr|vert|ind)ix|ex$", "$1ices");
- plural("([m|l])ouse$", "$1ice");
- plural("(ox)$", "$1en");
- plural("(quiz)$", "$1zes");
+ public static Inflector.Builder createDefaultBuilder()
+ {
+ Builder builder = builder();
- singular("s$", "");
- singular("(n)ews$", "$1ews");
- singular("([ti])a$", "$1um");
- singular("((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$", "$1$2sis");
- singular("(^analy)ses$", "$1sis");
- singular("([^f])ves$", "$1fe");
- singular("(hive)s$", "$1");
- singular("(tive)s$", "$1");
- singular("([lr])ves$", "$1f");
- singular("([^aeiouy]|qu)ies$", "$1y");
- singular("(s)eries$", "$1eries");
- singular("(m)ovies$", "$1ovie");
- singular("(x|ch|ss|sh)es$", "$1");
- singular("([m|l])ice$", "$1ouse");
- singular("(bus)es$", "$1");
- singular("(o)es$", "$1");
- singular("(shoe)s$", "$1");
- singular("(cris|ax|test)es$", "$1is");
- singular("([octop|vir])i$", "$1us");
- singular("(alias|status)es$", "$1");
- singular("^(ox)en", "$1");
- singular("(vert|ind)ices$", "$1ex");
- singular("(matr)ices$", "$1ix");
- singular("(quiz)zes$", "$1");
- singular("(ess)$", "$1");
+ builder.plural("$", "s")
+ .plural("s$", "s")
+ .plural("(ax|test)is$", "$1es")
+ .plural("(octop|vir)us$", "$1i")
+ .plural("(alias|status)$", "$1es")
+ .plural("(bu)s$", "$1es")
+ .plural("(buffal|tomat)o$", "$1oes")
+ .plural("([ti])um$", "$1a")
+ .plural("sis$", "ses")
+ .plural("(?:([^f])fe|([lr])f)$", "$1$2ves")
+ .plural("(hive)$", "$1s")
+ .plural("([^aeiouy]|qu)y$", "$1ies")
+ .plural("([^aeiouy]|qu)ies$", "$1y")
+ .plural("(x|ch|ss|sh)$", "$1es")
+ .plural("(matr|vert|ind)ix|ex$", "$1ices")
+ .plural("([m|l])ouse$", "$1ice")
+ .plural("(ox)$", "$1en")
+ .plural("(quiz)$", "$1zes");
- singular("men$", "man");
- plural("man$", "men");
+ builder.singular("s$", "")
+ .singular("(n)ews$", "$1ews")
+ .singular("([ti])a$", "$1um")
+ .singular("((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$", "$1$2sis")
+ .singular("(^analy)ses$", "$1sis")
+ .singular("([^f])ves$", "$1fe")
+ .singular("(hive)s$", "$1")
+ .singular("(tive)s$", "$1")
+ .singular("([lr])ves$", "$1f")
+ .singular("([^aeiouy]|qu)ies$", "$1y")
+ .singular("(s)eries$", "$1eries")
+ .singular("(m)ovies$", "$1ovie")
+ .singular("(x|ch|ss|sh)es$", "$1")
+ .singular("([m|l])ice$", "$1ouse")
+ .singular("(bus)es$", "$1")
+ .singular("(o)es$", "$1")
+ .singular("(shoe)s$", "$1")
+ .singular("(cris|ax|test)es$", "$1is")
+ .singular("([octop|vir])i$", "$1us")
+ .singular("(alias|status)es$", "$1")
+ .singular("^(ox)en", "$1")
+ .singular("(vert|ind)ices$", "$1ex")
+ .singular("(matr)ices$", "$1ix")
+ .singular("(quiz)zes$", "$1")
+ .singular("(ess)$", "$1");
- irregular("curve", "curves");
- irregular("leaf", "leaves");
- irregular("roof", "rooves");
- irregular("person", "people");
- irregular("child", "children");
- irregular("sex", "sexes");
- irregular("move", "moves");
+ builder.singular("men$", "man")
+ .plural("man$", "men");
- uncountable(new String[] { "equipment", "information", "rice", "money", "species", "series", "fish", "sheep", "s" });
+ builder.irregular("curve", "curves")
+ .irregular("leaf", "leaves")
+ .irregular("roof", "rooves")
+ .irregular("person", "people")
+ .irregular("child", "children")
+ .irregular("sex", "sexes")
+ .irregular("move", "moves");
+
+ builder.uncountable(new String[] { "equipment", "information", "rice", "money", "species", "series", "fish", "sheep", "s" });
+
+ return builder;
}
public static Inflector getInstance() {
@@ -122,28 +128,27 @@
return underscoredWord;
}
- public synchronized String pluralize(String word) {
+ public String pluralize(String word) {
if (uncountables.contains(word.toLowerCase())) {
return word;
}
return replaceWithFirstRule(word, plurals);
}
- public synchronized String singularize(String word) {
+ public String singularize(String word) {
if (uncountables.contains(word.toLowerCase())) {
return word;
}
return replaceWithFirstRule(word, singulars);
}
- private String replaceWithFirstRule(String word, List<RuleAndReplacement> ruleAndReplacements) {
+ private static String replaceWithFirstRule(String word, List<RuleAndReplacement> ruleAndReplacements) {
for (RuleAndReplacement rar : ruleAndReplacements) {
- String rule = rar.getRule();
String replacement = rar.getReplacement();
// Return if we find a match.
- Matcher matcher = Pattern.compile(rule, Pattern.CASE_INSENSITIVE).matcher(word);
+ Matcher matcher = rar.getPattern().matcher(word);
if (matcher.find()) {
return matcher.replaceAll(replacement);
}
@@ -161,49 +166,68 @@
return tableize(className);
}
- private void plural(String rule, String replacement) {
- plurals.add(0, new RuleAndReplacement(rule, replacement));
+ public static Builder builder()
+ {
+ return new Builder();
}
- private void singular(String rule, String replacement) {
- singulars.add(0, new RuleAndReplacement(rule, replacement));
+ // Ugh, no open structs in Java (not-natively at least).
+ private static class RuleAndReplacement {
+ private final String rule;
+ private final String replacement;
+ private final Pattern pattern;
+
+ public RuleAndReplacement(String rule, String replacement) {
+ this.rule = rule;
+ this.replacement = replacement;
+ this.pattern = Pattern.compile(rule, Pattern.CASE_INSENSITIVE);
+ }
+
+ public String getReplacement() {
+ return replacement;
+ }
+
+ public String getRule() {
+ return rule;
+ }
+
+ public Pattern getPattern() {
+ return pattern;
+ }
}
- private void irregular(String singular, String plural) {
- plural(singular, plural);
- singular(plural, singular);
- }
+ public static class Builder
+ {
+ private List<RuleAndReplacement> plurals = new ArrayList<RuleAndReplacement>();
+ private List<RuleAndReplacement> singulars = new ArrayList<RuleAndReplacement>();
+ private List<String> uncountables = new ArrayList<String>();
- private void uncountable(String... words) {
- for (String word : words) {
- uncountables.add(word);
+ public Builder plural(String rule, String replacement) {
+ plurals.add(0, new RuleAndReplacement(rule, replacement));
+ return this;
+ }
+
+ public Builder singular(String rule, String replacement) {
+ singulars.add(0, new RuleAndReplacement(rule, replacement));
+ return this;
+ }
+
+ public Builder irregular(String singular, String plural) {
+ plural(singular, plural);
+ singular(plural, singular);
+ return this;
+ }
+
+ public Builder uncountable(String... words) {
+ for (String word : words) {
+ uncountables.add(word);
+ }
+ return this;
+ }
+
+ public Inflector build()
+ {
+ return new Inflector(this);
}
}
}
-
-// Ugh, no open structs in Java (not-natively at least).
-class RuleAndReplacement {
- private String rule;
- private String replacement;
-
- public RuleAndReplacement(String rule, String replacement) {
- this.rule = rule;
- this.replacement = replacement;
- }
-
- public String getReplacement() {
- return replacement;
- }
-
- public void setReplacement(String replacement) {
- this.replacement = replacement;
- }
-
- public String getRule() {
- return rule;
- }
-
- public void setRule(String rule) {
- this.rule = rule;
- }
-}
\ No newline at end of file
|
