Skip to content

Commit c594345

Browse files
quinnandrewsquinnandrews
authored
Merge pull request #19 from quinnandrews/10-specification-builder-migrate-factory-methods-to-static-methods
Refactor Factory methods
2 parents b3c9610 + aa4019d commit c594345

File tree

5 files changed

+196
-192
lines changed

5 files changed

+196
-192
lines changed

‎src/main/java/io/github/quinnandrews/spring/data/specification/builder/SpecificationBuilder.java‎

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
* @author Quinn Andrews
1616
*/
1717
public class SpecificationBuilder<T> {
18-
19-
private final SpecificationFactory specificationFactory = new SpecificationFactory();
2018

2119
private Specification<T> specification;
2220

@@ -77,188 +75,188 @@ public SpecificationBuilder<T> orWhere(final Specification<T> specification) {
7775
@Deprecated
7876
public SpecificationBuilder<T> whereEquals(final SingularAttribute<T, ?> attribute,
7977
final Object value) {
80-
return where(specificationFactory.equal(attribute, value));
78+
return where(SpecificationFactory.isEqualTo(attribute, value));
8179
}
8280

8381
@Deprecated
8482
public SpecificationBuilder<T> whereNotEquals(final SingularAttribute<T, ?> attribute,
8583
final Object value) {
86-
return where(specificationFactory.notEqual(attribute, value));
84+
return where(SpecificationFactory.isNotEqualTo(attribute, value));
8785
}
8886

8987
@Deprecated
9088
public SpecificationBuilder<T> whereLike(final SingularAttribute<T, String> attribute,
9189
final String value) {
92-
return where(specificationFactory.like(attribute, value));
90+
return where(SpecificationFactory.isLike(attribute, value));
9391
}
9492

9593
@Deprecated
9694
public SpecificationBuilder<T> whereNotLike(final SingularAttribute<T, String> attribute,
9795
final String value) {
98-
return where(specificationFactory.notLike(attribute, value));
96+
return where(SpecificationFactory.isNotLike(attribute, value));
9997
}
10098

10199
@Deprecated
102100
public SpecificationBuilder<T> whereEqualsOrLike(final SingularAttribute<T, String> attribute,
103101
final String value) {
104-
return where(specificationFactory.equalOrLike(attribute, value));
102+
return where(SpecificationFactory.isEqualToOrLike(attribute, value));
105103
}
106104

107105
@Deprecated
108106
public SpecificationBuilder<T> whereIsNull(final SingularAttribute<T, ?> attribute) {
109-
return where(specificationFactory.isNull(attribute));
107+
return where(SpecificationFactory.isNull(attribute));
110108
}
111109

112110
@Deprecated
113111
public SpecificationBuilder<T> whereIsNotNull(final SingularAttribute<T, ?> attribute) {
114-
return where(specificationFactory.isNotNull(attribute));
112+
return where(SpecificationFactory.isNotNull(attribute));
115113
}
116114

117115
@Deprecated
118116
public SpecificationBuilder<T> whereIsTrue(final SingularAttribute<T, Boolean> attribute) {
119-
return where(specificationFactory.isTrue(attribute));
117+
return where(SpecificationFactory.isTrue(attribute));
120118
}
121119

122120
@Deprecated
123121
public SpecificationBuilder<T> whereIsFalse(final SingularAttribute<T, Boolean> attribute) {
124-
return where(specificationFactory.isFalse(attribute));
122+
return where(SpecificationFactory.isFalse(attribute));
125123
}
126124

127125
@Deprecated
128126
public <V extends Comparable<? super V>> SpecificationBuilder<T> whereGreaterThan(final SingularAttribute<T, V> attribute,
129127
final V value) {
130-
return where(specificationFactory.greaterThan(attribute, value));
128+
return where(SpecificationFactory.isGreaterThan(attribute, value));
131129
}
132130

133131
@Deprecated
134132
public <V extends Comparable<? super V>> SpecificationBuilder<T> whereGreaterThanOrEqualTo(final SingularAttribute<T, V> attribute,
135133
final V value) {
136-
return where(specificationFactory.greaterThanOrEqualTo(attribute, value));
134+
return where(SpecificationFactory.isGreaterThanOrEqualTo(attribute, value));
137135
}
138136

139137
@Deprecated
140138
public <V extends Comparable<? super V>> SpecificationBuilder<T> whereLessThan(final SingularAttribute<T, V> attribute,
141139
final V value) {
142-
return where(specificationFactory.lessThan(attribute, value));
140+
return where(SpecificationFactory.isLessThan(attribute, value));
143141
}
144142

145143
@Deprecated
146144
public <V extends Comparable<? super V>> SpecificationBuilder<T> whereLessThanOrEqualTo(final SingularAttribute<T, V> attribute,
147145
final V value) {
148-
return where(specificationFactory.lessThanOrEqualTo(attribute, value));
146+
return where(SpecificationFactory.isLessThanOrEqualTo(attribute, value));
149147
}
150148

151149
@Deprecated
152150
public <V extends Comparable<? super V>> SpecificationBuilder<T> whereBetween(final SingularAttribute<T, V> attribute,
153151
final V firstValue,
154152
final V secondValue) {
155-
return where(specificationFactory.between(attribute, firstValue, secondValue));
153+
return where(SpecificationFactory.isBetween(attribute, firstValue, secondValue));
156154
}
157155

158156
@Deprecated
159157
public SpecificationBuilder<T> whereIn(final SingularAttribute<T, ?> attribute,
160158
final Collection<?> collection) {
161-
return where(specificationFactory.in(attribute, collection));
159+
return where(SpecificationFactory.isIn(attribute, collection));
162160
}
163161

164162
@Deprecated
165163
public SpecificationBuilder<T> whereIn(final SingularAttribute<T, ?> attribute,
166164
final Object... values) {
167-
return where(specificationFactory.in(attribute, values));
165+
return where(SpecificationFactory.isIn(attribute, values));
168166
}
169167

170168
@Deprecated
171169
public SpecificationBuilder<T> withFetch(final SingularAttribute<T, ?> attribute) {
172-
return and(specificationFactory.fetch(attribute));
170+
return and(SpecificationFactory.fetch(attribute));
173171
}
174172

175173
@Deprecated
176174
public SpecificationBuilder<T> withFetch(final PluralAttribute<T, ?, ?> attribute) {
177-
return and(specificationFactory.fetch(attribute));
175+
return and(SpecificationFactory.fetch(attribute));
178176
}
179177

180178
public SpecificationBuilder<T> isEqualTo(final SingularAttribute<T, ?> attribute,
181179
final Object value) {
182-
return where(specificationFactory.equal(attribute, value));
180+
return where(SpecificationFactory.isEqualTo(attribute, value));
183181
}
184182

185183
public SpecificationBuilder<T> isNotEqualTo(final SingularAttribute<T, ?> attribute,
186184
final Object value) {
187-
return where(specificationFactory.notEqual(attribute, value));
185+
return where(SpecificationFactory.isNotEqualTo(attribute, value));
188186
}
189187

190188
public SpecificationBuilder<T> isLike(final SingularAttribute<T, String> attribute,
191189
final String value) {
192-
return where(specificationFactory.like(attribute, value));
190+
return where(SpecificationFactory.isLike(attribute, value));
193191
}
194192

195193
public SpecificationBuilder<T> isNotLike(final SingularAttribute<T, String> attribute,
196194
final String value) {
197-
return where(specificationFactory.notLike(attribute, value));
195+
return where(SpecificationFactory.isNotLike(attribute, value));
198196
}
199197

200198
public SpecificationBuilder<T> isEqualToOrLike(final SingularAttribute<T, String> attribute,
201199
final String value) {
202-
return where(specificationFactory.equalOrLike(attribute, value));
200+
return where(SpecificationFactory.isEqualToOrLike(attribute, value));
203201
}
204202

205203
public SpecificationBuilder<T> isNull(final SingularAttribute<T, ?> attribute) {
206-
return where(specificationFactory.isNull(attribute));
204+
return where(SpecificationFactory.isNull(attribute));
207205
}
208206

209207
public SpecificationBuilder<T> isNotNull(final SingularAttribute<T, ?> attribute) {
210-
return where(specificationFactory.isNotNull(attribute));
208+
return where(SpecificationFactory.isNotNull(attribute));
211209
}
212210

213211
public SpecificationBuilder<T> isTrue(final SingularAttribute<T, Boolean> attribute) {
214-
return where(specificationFactory.isTrue(attribute));
212+
return where(SpecificationFactory.isTrue(attribute));
215213
}
216214

217215
public SpecificationBuilder<T> isFalse(final SingularAttribute<T, Boolean> attribute) {
218-
return where(specificationFactory.isFalse(attribute));
216+
return where(SpecificationFactory.isFalse(attribute));
219217
}
220218

221219
public <V extends Comparable<? super V>> SpecificationBuilder<T> isGreaterThan(final SingularAttribute<T, V> attribute,
222220
final V value) {
223-
return where(specificationFactory.greaterThan(attribute, value));
221+
return where(SpecificationFactory.isGreaterThan(attribute, value));
224222
}
225223

226224
public <V extends Comparable<? super V>> SpecificationBuilder<T> isGreaterThanOrEqualTo(final SingularAttribute<T, V> attribute,
227225
final V value) {
228-
return where(specificationFactory.greaterThanOrEqualTo(attribute, value));
226+
return where(SpecificationFactory.isGreaterThanOrEqualTo(attribute, value));
229227
}
230228

231229
public <V extends Comparable<? super V>> SpecificationBuilder<T> isLessThan(final SingularAttribute<T, V> attribute,
232230
final V value) {
233-
return where(specificationFactory.lessThan(attribute, value));
231+
return where(SpecificationFactory.isLessThan(attribute, value));
234232
}
235233

236234
public <V extends Comparable<? super V>> SpecificationBuilder<T> isLessThanOrEqualTo(final SingularAttribute<T, V> attribute,
237235
final V value) {
238-
return where(specificationFactory.lessThanOrEqualTo(attribute, value));
236+
return where(SpecificationFactory.isLessThanOrEqualTo(attribute, value));
239237
}
240238

241239
public <V extends Comparable<? super V>> SpecificationBuilder<T> isBetween(final SingularAttribute<T, V> attribute,
242240
final V firstValue,
243241
final V secondValue) {
244-
return where(specificationFactory.between(attribute, firstValue, secondValue));
242+
return where(SpecificationFactory.isBetween(attribute, firstValue, secondValue));
245243
}
246244

247245
public SpecificationBuilder<T> isIn(final SingularAttribute<T, ?> attribute,
248246
final Collection<?> collection) {
249-
return where(specificationFactory.in(attribute, collection));
247+
return where(SpecificationFactory.isIn(attribute, collection));
250248
}
251249

252250
public SpecificationBuilder<T> isIn(final SingularAttribute<T, ?> attribute,
253251
final Object... values) {
254-
return where(specificationFactory.in(attribute, values));
252+
return where(SpecificationFactory.isIn(attribute, values));
255253
}
256254

257255
public SpecificationBuilder<T> fetch(final SingularAttribute<T, ?> attribute) {
258-
return and(specificationFactory.fetch(attribute));
256+
return and(SpecificationFactory.fetch(attribute));
259257
}
260258

261259
public SpecificationBuilder<T> fetch(final PluralAttribute<T, ?, ?> attribute) {
262-
return and(specificationFactory.fetch(attribute));
260+
return and(SpecificationFactory.fetch(attribute));
263261
}
264262
}

0 commit comments

Comments
 (0)