Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 63c41b8

Browse filesBrowse files
author
Marcus Linke
committed
Refactored error handling
1 parent 0a623e4 commit 63c41b8
Copy full SHA for 63c41b8

61 files changed

+407-432Lines changed: 407 additions & 432 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎…ckerjava/client/BadRequestException.java‎ ‎…/dockerjava/api/BadRequestException.java‎src/main/java/com/github/dockerjava/client/BadRequestException.java renamed to src/main/java/com/github/dockerjava/api/BadRequestException.java src/main/java/com/github/dockerjava/client/BadRequestException.java renamed to src/main/java/com/github/dockerjava/api/BadRequestException.java

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/api/BadRequestException.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package com.github.dockerjava.client;
1+
package com.github.dockerjava.api;
2+
23

34
/**
45
*
Collapse file

‎src/main/java/com/github/dockerjava/api/ConflictException.java‎

Copy file name to clipboard
+23Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.github.dockerjava.api;
2+
3+
4+
/**
5+
*
6+
*/
7+
public class ConflictException extends DockerException {
8+
9+
private static final long serialVersionUID = -290093024775500239L;
10+
11+
public ConflictException(String message, Throwable cause) {
12+
super(message, 409, cause);
13+
}
14+
15+
public ConflictException(String message) {
16+
this(message, null);
17+
}
18+
19+
public ConflictException(Throwable cause) {
20+
this(cause.getMessage(), cause);
21+
}
22+
23+
}
Collapse file

‎…erjava/client/DockerClientException.java‎ ‎…ockerjava/api/DockerClientException.java‎src/main/java/com/github/dockerjava/client/DockerClientException.java renamed to src/main/java/com/github/dockerjava/api/DockerClientException.java src/main/java/com/github/dockerjava/client/DockerClientException.java renamed to src/main/java/com/github/dockerjava/api/DockerClientException.java

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/api/DockerClientException.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.dockerjava.client;
1+
package com.github.dockerjava.api;
22

33
/**
44
*
Collapse file

‎…b/dockerjava/client/DockerException.java‎ ‎…thub/dockerjava/api/DockerException.java‎src/main/java/com/github/dockerjava/client/DockerException.java renamed to src/main/java/com/github/dockerjava/api/DockerException.java src/main/java/com/github/dockerjava/client/DockerException.java renamed to src/main/java/com/github/dockerjava/api/DockerException.java

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/api/DockerException.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.dockerjava.client;
1+
package com.github.dockerjava.api;
22

33

44

Collapse file

‎…client/InternalServerErrorException.java‎ ‎…va/api/InternalServerErrorException.java‎src/main/java/com/github/dockerjava/client/InternalServerErrorException.java renamed to src/main/java/com/github/dockerjava/api/InternalServerErrorException.java src/main/java/com/github/dockerjava/client/InternalServerErrorException.java renamed to src/main/java/com/github/dockerjava/api/InternalServerErrorException.java

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.dockerjava.client;
1+
package com.github.dockerjava.api;
22

33
/**
44
*
Collapse file

‎…rjava/client/NotAcceptableException.java‎ ‎…ckerjava/api/NotAcceptableException.java‎src/main/java/com/github/dockerjava/client/NotAcceptableException.java renamed to src/main/java/com/github/dockerjava/api/NotAcceptableException.java src/main/java/com/github/dockerjava/client/NotAcceptableException.java renamed to src/main/java/com/github/dockerjava/api/NotAcceptableException.java

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/api/NotAcceptableException.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.dockerjava.client;
1+
package com.github.dockerjava.api;
22

33
/**
44
*
Collapse file

‎…dockerjava/client/NotFoundException.java‎ ‎…ub/dockerjava/api/NotFoundException.java‎src/main/java/com/github/dockerjava/client/NotFoundException.java renamed to src/main/java/com/github/dockerjava/api/NotFoundException.java src/main/java/com/github/dockerjava/client/NotFoundException.java renamed to src/main/java/com/github/dockerjava/api/NotFoundException.java

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/api/NotFoundException.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.dockerjava.client;
1+
package com.github.dockerjava.api;
22

33
/**
44
* Indicates that the given entity does not exist.
Collapse file

‎…kerjava/client/NotModifiedException.java‎ ‎…dockerjava/api/NotModifiedException.java‎src/main/java/com/github/dockerjava/client/NotModifiedException.java renamed to src/main/java/com/github/dockerjava/api/NotModifiedException.java src/main/java/com/github/dockerjava/client/NotModifiedException.java renamed to src/main/java/com/github/dockerjava/api/NotModifiedException.java

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/api/NotModifiedException.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.dockerjava.client;
1+
package com.github.dockerjava.api;
22

33
/**
44
*
Collapse file

‎src/main/java/com/github/dockerjava/client/DockerClient.java‎

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/client/DockerClient.java
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import java.io.*;
77

8+
import com.github.dockerjava.api.DockerException;
89
import com.github.dockerjava.client.command.*;
910

1011
import org.apache.commons.io.IOUtils;
@@ -18,7 +19,6 @@
1819
import org.apache.http.impl.conn.PoolingClientConnectionManager;
1920

2021
import com.github.dockerjava.client.model.AuthConfig;
21-
2222
import com.github.dockerjava.client.utils.JsonClientFilter;
2323
import com.sun.jersey.api.client.Client;
2424
import com.sun.jersey.api.client.ClientResponse;
@@ -266,18 +266,18 @@ public TagImageCmd tagImageCmd(String imageId, String repository, String tag) {
266266
/**
267267
* @return The output slurped into a string.
268268
*/
269-
public static String asString(ClientResponse response) throws IOException {
269+
public static String asString(InputStream response) throws IOException {
270270

271271
StringWriter out = new StringWriter();
272272
try {
273273
LineIterator itr = IOUtils.lineIterator(
274-
response.getEntityInputStream(), "UTF-8");
274+
response, "UTF-8");
275275
while (itr.hasNext()) {
276276
String line = itr.next();
277277
out.write(line + (itr.hasNext() ? "\n" : ""));
278278
}
279279
} finally {
280-
closeQuietly(response.getEntityInputStream());
280+
closeQuietly(response);
281281
}
282282
return out.toString();
283283
}
Collapse file

‎src/main/java/com/github/dockerjava/client/command/AbstrDockerCmd.java‎

Copy file name to clipboardExpand all lines: src/main/java/com/github/dockerjava/client/command/AbstrDockerCmd.java
+19-13Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
import com.github.dockerjava.client.BadRequestException;
7-
import com.github.dockerjava.client.DockerException;
8-
import com.github.dockerjava.client.InternalServerErrorException;
9-
import com.github.dockerjava.client.NotAcceptableException;
10-
import com.github.dockerjava.client.NotFoundException;
11-
import com.github.dockerjava.client.NotModifiedException;
6+
import com.github.dockerjava.api.BadRequestException;
7+
import com.github.dockerjava.api.ConflictException;
8+
import com.github.dockerjava.api.DockerException;
9+
import com.github.dockerjava.api.InternalServerErrorException;
10+
import com.github.dockerjava.api.NotAcceptableException;
11+
import com.github.dockerjava.api.NotFoundException;
12+
import com.github.dockerjava.api.NotModifiedException;
1213
import com.google.common.base.Preconditions;
1314
import com.sun.jersey.api.client.UniformInterfaceException;
1415
import com.sun.jersey.api.client.WebResource;
@@ -27,8 +28,11 @@ public T withBaseResource(WebResource baseResource) {
2728

2829
protected abstract RES_T impl();
2930

31+
/**
32+
* @throws DockerException If something gets wrong
33+
*/
3034
@Override
31-
public RES_T exec() {
35+
public RES_T exec() throws DockerException {
3236
Preconditions.checkNotNull(baseResource, "baseResource was not specified");
3337
LOGGER.debug("Cmd: {}", this);
3438

@@ -37,12 +41,14 @@ public RES_T exec() {
3741
} catch (UniformInterfaceException exception) {
3842
int status = exception.getResponse().getStatus();
3943
switch(status) {
40-
case 304: throw new NotModifiedException(exception.getMessage(), exception);
41-
case 400: throw new BadRequestException(exception.getMessage(), exception);
42-
case 404: throw new NotFoundException(exception.getMessage(), exception);
43-
case 406: throw new NotAcceptableException(exception.getMessage(), exception);
44-
case 500: throw new InternalServerErrorException(exception.getMessage(), exception);
45-
default: throw toDockerException(exception);
44+
case 204: return null;
45+
case 304: throw new NotModifiedException(exception);
46+
case 400: throw new BadRequestException(exception);
47+
case 404: throw new NotFoundException(exception);
48+
case 406: throw new NotAcceptableException(exception);
49+
case 409: throw new ConflictException(exception);
50+
case 500: throw new InternalServerErrorException(exception);
51+
default: throw toDockerException(exception);
4652
}
4753
}
4854
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.