Skip to content

Commit 7305c67

Browse files
committed
chore: change argumention for apiexception
1 parent 7833f99 commit 7305c67

File tree

8 files changed

+18
-10
lines changed

8 files changed

+18
-10
lines changed

src/main/java/io/managed/services/test/client/BaseApi.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ protected BaseApi() {
2727
private <A> A handleException(ThrowingSupplier<A, Exception> f) throws ApiGenericException {
2828
try {
2929
return f.get();
30-
} catch (ApiGenericException e) {
30+
} catch (ApiGenericException e) {
3131
throw e;
3232
} catch (Exception e) {
3333
log.info(e);
34-
3534
var ex = toApiException(e);
3635
if (ex != null) {
3736
log.info(ex);
38-
throw ex;
37+
throw ApiGenericException.apiException(ex);
3938
}
4039
throw new RuntimeException(e);
4140
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.managed.services.test.client.exception;
22

33
public class ApiConflictException extends ApiGenericException {
4-
public ApiConflictException(ApiUnknownException e) {
4+
public ApiConflictException(ApiGenericException e) {
55
super(e);
66
}
77
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.managed.services.test.client.exception;
22

33
public class ApiForbiddenException extends ApiGenericException {
4-
public ApiForbiddenException(ApiUnknownException e) {
4+
public ApiForbiddenException(ApiGenericException e) {
55
super(e);
66
}
77
}

src/main/java/io/managed/services/test/client/exception/ApiGenericException.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ public ApiGenericException(ApiUnknownException e) {
2424
this.id = e.getId();
2525
}
2626

27+
public ApiGenericException(ApiGenericException e) {
28+
super(e.getReason(), e);
29+
this.responseStatusCode = e.getResponseStatusCode();
30+
this.reason = e.getReason();
31+
this.code = e.getCode();
32+
this.href = e.getHref();
33+
this.id = e.getId();
34+
}
35+
2736
public ApiGenericException(
2837
String reason,
2938
String code,
@@ -60,7 +69,7 @@ public String getId() {
6069
return id;
6170
}
6271

63-
public static ApiGenericException apiException(ApiUnknownException e) {
72+
public static ApiGenericException apiException(ApiGenericException e) {
6473
switch (e.getResponseStatusCode()) {
6574
case HttpURLConnection.HTTP_NOT_FOUND:
6675
return new ApiNotFoundException(e);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.managed.services.test.client.exception;
22

33
public class ApiLockedException extends ApiGenericException {
4-
public ApiLockedException(ApiUnknownException e) {
4+
public ApiLockedException(ApiGenericException e) {
55
super(e);
66
}
77
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.managed.services.test.client.exception;
22

33
public class ApiNotFoundException extends ApiGenericException {
4-
public ApiNotFoundException(ApiUnknownException e) {
4+
public ApiNotFoundException(ApiGenericException e) {
55
super(e);
66
}
77
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.managed.services.test.client.exception;
22

33
public class ApiToManyRequestsException extends ApiGenericException {
4-
public ApiToManyRequestsException(ApiUnknownException e) {
4+
public ApiToManyRequestsException(ApiGenericException e) {
55
super(e);
66
}
77
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.managed.services.test.client.exception;
22

33
public class ApiUnauthorizedException extends ApiGenericException {
4-
public ApiUnauthorizedException(ApiUnknownException e) {
4+
public ApiUnauthorizedException(ApiGenericException e) {
55
super(e);
66
}
77
}

0 commit comments

Comments
 (0)