Skip to content

Commit a1f779f

Browse files
author
Stephane Landelle
committed
minor clean up, properly use NPE instead of IAE
1 parent 619bda4 commit a1f779f

14 files changed

+63
-79
lines changed

‎src/main/java/com/ning/http/client/AsyncHttpClient.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public ListenableFuture<Response> execute() throws IOException {
234234
// access these methods - see Clojure tickets 126 and 259
235235

236236
@Override
237-
public BoundRequestBuilder addBodyPart(Part part) throws IllegalArgumentException {
237+
public BoundRequestBuilder addBodyPart(Part part) {
238238
return super.addBodyPart(part);
239239
}
240240

@@ -249,7 +249,7 @@ public BoundRequestBuilder addHeader(String name, String value) {
249249
}
250250

251251
@Override
252-
public BoundRequestBuilder addParameter(String key, String value) throws IllegalArgumentException {
252+
public BoundRequestBuilder addParameter(String key, String value) {
253253
return super.addParameter(key, value);
254254
}
255255

@@ -264,12 +264,12 @@ public Request build() {
264264
}
265265

266266
@Override
267-
public BoundRequestBuilder setBody(byte[] data) throws IllegalArgumentException {
267+
public BoundRequestBuilder setBody(byte[] data) {
268268
return super.setBody(data);
269269
}
270270

271271
@Override
272-
public BoundRequestBuilder setBody(EntityWriter dataWriter, long length) throws IllegalArgumentException {
272+
public BoundRequestBuilder setBody(EntityWriter dataWriter, long length) {
273273
return super.setBody(dataWriter, length);
274274
}
275275

@@ -279,12 +279,12 @@ public BoundRequestBuilder setBody(EntityWriter dataWriter) {
279279
}
280280

281281
@Override
282-
public BoundRequestBuilder setBody(InputStream stream) throws IllegalArgumentException {
282+
public BoundRequestBuilder setBody(InputStream stream) {
283283
return super.setBody(stream);
284284
}
285285

286286
@Override
287-
public BoundRequestBuilder setBody(String data) throws IllegalArgumentException {
287+
public BoundRequestBuilder setBody(String data) {
288288
return super.setBody(data);
289289
}
290290

@@ -304,12 +304,12 @@ public BoundRequestBuilder setHeaders(Map<String, Collection<String>> headers) {
304304
}
305305

306306
@Override
307-
public BoundRequestBuilder setParameters(Map<String, Collection<String>> parameters) throws IllegalArgumentException {
307+
public BoundRequestBuilder setParameters(Map<String, Collection<String>> parameters) {
308308
return super.setParameters(parameters);
309309
}
310310

311311
@Override
312-
public BoundRequestBuilder setParameters(FluentStringsMap parameters) throws IllegalArgumentException {
312+
public BoundRequestBuilder setParameters(FluentStringsMap parameters) {
313313
return super.setParameters(parameters);
314314
}
315315

‎src/main/java/com/ning/http/client/RequestBuilder.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public RequestBuilder(Request prototype) {
5050
// access these methods - see Clojure tickets 126 and 259
5151

5252
@Override
53-
public RequestBuilder addBodyPart(Part part) throws IllegalArgumentException {
53+
public RequestBuilder addBodyPart(Part part) {
5454
return super.addBodyPart(part);
5555
}
5656

@@ -65,7 +65,7 @@ public RequestBuilder addHeader(String name, String value) {
6565
}
6666

6767
@Override
68-
public RequestBuilder addParameter(String key, String value) throws IllegalArgumentException {
68+
public RequestBuilder addParameter(String key, String value) {
6969
return super.addParameter(key, value);
7070
}
7171

@@ -85,12 +85,12 @@ public Request build() {
8585
}
8686

8787
@Override
88-
public RequestBuilder setBody(byte[] data) throws IllegalArgumentException {
88+
public RequestBuilder setBody(byte[] data) {
8989
return super.setBody(data);
9090
}
9191

9292
@Override
93-
public RequestBuilder setBody(EntityWriter dataWriter, long length) throws IllegalArgumentException {
93+
public RequestBuilder setBody(EntityWriter dataWriter, long length) {
9494
return super.setBody(dataWriter, length);
9595
}
9696

@@ -111,12 +111,12 @@ public RequestBuilder setBody(EntityWriter dataWriter) {
111111
*/
112112
@Override
113113
@Deprecated
114-
public RequestBuilder setBody(InputStream stream) throws IllegalArgumentException {
114+
public RequestBuilder setBody(InputStream stream) {
115115
return super.setBody(stream);
116116
}
117117

118118
@Override
119-
public RequestBuilder setBody(String data) throws IllegalArgumentException {
119+
public RequestBuilder setBody(String data) {
120120
return super.setBody(data);
121121
}
122122

@@ -136,12 +136,12 @@ public RequestBuilder setHeaders(Map<String, Collection<String>> headers) {
136136
}
137137

138138
@Override
139-
public RequestBuilder setParameters(Map<String, Collection<String>> parameters) throws IllegalArgumentException {
139+
public RequestBuilder setParameters(Map<String, Collection<String>> parameters) {
140140
return super.setParameters(parameters);
141141
}
142142

143143
@Override
144-
public RequestBuilder setParameters(FluentStringsMap parameters) throws IllegalArgumentException {
144+
public RequestBuilder setParameters(FluentStringsMap parameters) {
145145
return super.setParameters(parameters);
146146
}
147147

‎src/main/java/com/ning/http/client/RequestBuilderBase.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -490,23 +490,23 @@ public T setBody(File file) {
490490
return derived.cast(this);
491491
}
492492

493-
public T setBody(byte[] data) throws IllegalArgumentException {
493+
public T setBody(byte[] data) {
494494
resetParameters();
495495
resetNonMultipartData();
496496
resetMultipartData();
497497
request.byteData = data;
498498
return derived.cast(this);
499499
}
500500

501-
public T setBody(String data) throws IllegalArgumentException {
501+
public T setBody(String data) {
502502
resetParameters();
503503
resetNonMultipartData();
504504
resetMultipartData();
505505
request.stringData = data;
506506
return derived.cast(this);
507507
}
508508

509-
public T setBody(InputStream stream) throws IllegalArgumentException {
509+
public T setBody(InputStream stream) {
510510
resetParameters();
511511
resetNonMultipartData();
512512
resetMultipartData();
@@ -518,7 +518,7 @@ public T setBody(EntityWriter dataWriter) {
518518
return setBody(dataWriter, -1);
519519
}
520520

521-
public T setBody(EntityWriter dataWriter, long length) throws IllegalArgumentException {
521+
public T setBody(EntityWriter dataWriter, long length) {
522522
resetParameters();
523523
resetNonMultipartData();
524524
resetMultipartData();
@@ -549,7 +549,7 @@ public T setQueryParameters(FluentStringsMap parameters) {
549549
return derived.cast(this);
550550
}
551551

552-
public T addParameter(String key, String value) throws IllegalArgumentException {
552+
public T addParameter(String key, String value) {
553553
resetNonMultipartData();
554554
resetMultipartData();
555555
if (request.params == null) {
@@ -559,21 +559,21 @@ public T addParameter(String key, String value) throws IllegalArgumentException
559559
return derived.cast(this);
560560
}
561561

562-
public T setParameters(FluentStringsMap parameters) throws IllegalArgumentException {
562+
public T setParameters(FluentStringsMap parameters) {
563563
resetNonMultipartData();
564564
resetMultipartData();
565565
request.params = new FluentStringsMap(parameters);
566566
return derived.cast(this);
567567
}
568568

569-
public T setParameters(Map<String, Collection<String>> parameters) throws IllegalArgumentException {
569+
public T setParameters(Map<String, Collection<String>> parameters) {
570570
resetNonMultipartData();
571571
resetMultipartData();
572572
request.params = new FluentStringsMap(parameters);
573573
return derived.cast(this);
574574
}
575575

576-
public T addBodyPart(Part part) throws IllegalArgumentException {
576+
public T addBodyPart(Part part) {
577577
resetParameters();
578578
resetNonMultipartData();
579579
if (request.parts == null) {

‎src/main/java/com/ning/http/client/SimpleAsyncHttpClient.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,9 @@ public interface DerivedBuilder {
367367

368368
DerivedBuilder setUrl(String url);
369369

370-
DerivedBuilder setParameters(FluentStringsMap parameters) throws IllegalArgumentException;
370+
DerivedBuilder setParameters(FluentStringsMap parameters);
371371

372-
DerivedBuilder setParameters(Map<String, Collection<String>> parameters) throws IllegalArgumentException;
372+
DerivedBuilder setParameters(Map<String, Collection<String>> parameters);
373373

374374
DerivedBuilder setHeaders(Map<String, Collection<String>> headers);
375375

@@ -379,13 +379,13 @@ public interface DerivedBuilder {
379379

380380
DerivedBuilder addQueryParameter(String name, String value);
381381

382-
DerivedBuilder addParameter(String key, String value) throws IllegalArgumentException;
382+
DerivedBuilder addParameter(String key, String value);
383383

384384
DerivedBuilder addHeader(String name, String value);
385385

386386
DerivedBuilder addCookie(Cookie cookie);
387387

388-
DerivedBuilder addBodyPart(Part part) throws IllegalArgumentException;
388+
DerivedBuilder addBodyPart(Part part);
389389

390390
DerivedBuilder setResumableDownload(boolean resume);
391391

@@ -422,7 +422,7 @@ private Builder(SimpleAsyncHttpClient client) {
422422
this.listener = client.listener;
423423
}
424424

425-
public Builder addBodyPart(Part part) throws IllegalArgumentException {
425+
public Builder addBodyPart(Part part) {
426426
requestBuilder.addBodyPart(part);
427427
return this;
428428
}
@@ -437,7 +437,7 @@ public Builder addHeader(String name, String value) {
437437
return this;
438438
}
439439

440-
public Builder addParameter(String key, String value) throws IllegalArgumentException {
440+
public Builder addParameter(String key, String value) {
441441
requestBuilder.addParameter(key, value);
442442
return this;
443443
}
@@ -462,12 +462,12 @@ public Builder setHeaders(Map<String, Collection<String>> headers) {
462462
return this;
463463
}
464464

465-
public Builder setParameters(Map<String, Collection<String>> parameters) throws IllegalArgumentException {
465+
public Builder setParameters(Map<String, Collection<String>> parameters) {
466466
requestBuilder.setParameters(parameters);
467467
return this;
468468
}
469469

470-
public Builder setParameters(FluentStringsMap parameters) throws IllegalArgumentException {
470+
public Builder setParameters(FluentStringsMap parameters) {
471471
requestBuilder.setParameters(parameters);
472472
return this;
473473
}

‎src/main/java/com/ning/http/client/generators/FileBodyGenerator.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,16 @@ public class FileBodyGenerator
3333
private final long regionLength;
3434

3535
public FileBodyGenerator(File file) {
36-
if (file == null) {
37-
throw new IllegalArgumentException("no file specified");
38-
}
36+
if (file == null)
37+
throw new NullPointerException("file");
3938
this.file = file;
4039
this.regionLength = file.length();
4140
this.regionSeek = 0;
4241
}
4342

4443
public FileBodyGenerator(File file, long regionSeek, long regionLength) {
45-
if (file == null) {
46-
throw new IllegalArgumentException("no file specified");
47-
}
44+
if (file == null)
45+
throw new NullPointerException("file");
4846
this.file = file;
4947
this.regionLength = regionLength;
5048
this.regionSeek = regionSeek;

‎src/main/java/com/ning/http/client/providers/netty/BodyChunkedInput.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ class BodyChunkedInput implements ChunkedInput {
3232
private boolean endOfInput;
3333

3434
public BodyChunkedInput(Body body) {
35-
if (body == null) {
36-
throw new IllegalArgumentException("no body specified");
37-
}
35+
if (body == null)
36+
throw new NullPointerException("body");
3837
this.body = body;
3938
contentLength = (int) body.getContentLength();
4039
if (contentLength <= 0)

‎src/main/java/com/ning/http/client/providers/netty/BodyFileRegion.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ class BodyFileRegion
2727
private final RandomAccessBody body;
2828

2929
public BodyFileRegion(RandomAccessBody body) {
30-
if (body == null) {
31-
throw new IllegalArgumentException("no body specified");
32-
}
30+
if (body == null)
31+
throw new NullPointerException("body");
3332
this.body = body;
3433
}
3534

‎src/main/java/com/ning/http/multipart/FilePart.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ public class FilePart extends PartBase {
6464
public FilePart(String name, PartSource partSource, String contentType, String charset, String contentId) {
6565

6666
super(name, contentType == null ? DEFAULT_CONTENT_TYPE : contentType, charset, DEFAULT_TRANSFER_ENCODING, contentId);
67-
if (partSource == null) {
68-
throw new IllegalArgumentException("Source may not be null");
69-
}
67+
if (partSource == null)
68+
throw new NullPointerException("parSource");
7069
this.source = partSource;
7170
}
7271

‎src/main/java/com/ning/http/multipart/MultipartEncodingUtil.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ public static byte[] getAsciiBytes(String data) {
3333
}
3434

3535
public static String getAsciiString(final byte[] data) {
36-
if (data == null) {
37-
throw new IllegalArgumentException("Parameter may not be null");
38-
}
36+
if (data == null)
37+
throw new NullPointerException("data");
3938

4039
try {
4140
return new String(data, "US-ASCII");
@@ -46,9 +45,8 @@ public static String getAsciiString(final byte[] data) {
4645

4746
public static byte[] getBytes(final String data, String charset) {
4847

49-
if (data == null) {
50-
throw new IllegalArgumentException("data may not be null");
51-
}
48+
if (data == null)
49+
throw new NullPointerException("data");
5250

5351
if (charset == null || charset.length() == 0) {
5452
throw new IllegalArgumentException("charset may not be null or empty");

‎src/main/java/com/ning/http/multipart/MultipartRequestEntity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ public static byte[] generateMultipartBoundary() {
7070
* @param parts The parts to include.
7171
*/
7272
public MultipartRequestEntity(Part[] parts, FluentCaseInsensitiveStringsMap requestHeaders) {
73-
if (parts == null) {
74-
throw new IllegalArgumentException("parts cannot be null");
75-
}
73+
if (parts == null)
74+
throw new NullPointerException("parts");
7675
this.parts = parts;
7776
String contentTypeHeader = requestHeaders.getFirstValue("Content-Type");
7877
if (isNonEmpty(contentTypeHeader)) {

‎src/main/java/com/ning/http/multipart/Part.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -439,12 +439,10 @@ public String toString() {
439439
*/
440440
public static void sendParts(OutputStream out, Part[] parts, byte[] partBoundary) throws IOException {
441441

442-
if (parts == null) {
443-
throw new IllegalArgumentException("Parts may not be null");
444-
}
445-
if (partBoundary == null || partBoundary.length == 0) {
442+
if (parts == null)
443+
throw new NullPointerException("partsl");
444+
if (partBoundary == null || partBoundary.length == 0)
446445
throw new IllegalArgumentException("partBoundary may not be empty");
447-
}
448446
for (Part part : parts) {
449447
part.send(out, partBoundary);
450448
}
@@ -475,10 +473,8 @@ public static void sendMessageEnd(OutputStream out, byte[] partBoundary) throws
475473
* @since N/A
476474
*/
477475
public static void sendPart(OutputStream out, Part part, byte[] partBoundary) throws IOException {
478-
479-
if (part == null) {
480-
throw new IllegalArgumentException("Parts may not be null");
481-
}
476+
if (part == null)
477+
throw new NullPointerException("parts");
482478

483479
part.send(out, partBoundary);
484480
}
@@ -495,9 +491,8 @@ public static void sendPart(OutputStream out, Part part, byte[] partBoundary) th
495491
public static long getLengthOfParts(Part[] parts, byte[] partBoundary) {
496492

497493
try {
498-
if (parts == null) {
499-
throw new IllegalArgumentException("Parts may not be null");
500-
}
494+
if (parts == null)
495+
throw new NullPointerException("parts");
501496
long total = 0;
502497
for (Part part : parts) {
503498
long l = part.length(partBoundary);

0 commit comments

Comments
 (0)