Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,12 @@ public sealed interface E7 permits $GenericError, SampleErrorScalar {
public sealed interface E8 permits $GenericError, SampleErrorUnion {
}

public sealed interface E9 permits $GenericError, SampleErrorScalarSub {
public sealed interface E9 permits $GenericError, SampleError, SampleError2, SampleErrorWithValue {
}

public record $GenericError(Type type, String message, Throwable error) implements RSDError, E1, E2, E3, E4, E5, E6, E7, E8, E9 {
public sealed interface E10 permits $GenericError, SampleErrorScalarSub {
}

public record $GenericError(Type type, String message, Throwable error) implements RSDError, E1, E2, E3, E4, E5, E6, E7, E8, E9, E10 {
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Generated by RSD - Do not modify
package dev.rsdlang.sample.client;

public record SampleError(String message) implements RSDError, RSDError.E1, RSDError.E2 {
public record SampleError(String message) implements RSDError, RSDError.E1, RSDError.E2, RSDError.E9 {
@Override
public Type type() {
return Type.SampleError;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Generated by RSD - Do not modify
package dev.rsdlang.sample.client;

public record SampleError2(String message) implements RSDError, RSDError.E2 {
public record SampleError2(String message) implements RSDError, RSDError.E2, RSDError.E9 {
@Override
public Type type() {
return Type.SampleError2;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Generated by RSD - Do not modify
package dev.rsdlang.sample.client;

public record SampleErrorScalarSub(String message, MyRange data) implements RSDError, RSDError.E9 {
public record SampleErrorScalarSub(String message, MyRange data) implements RSDError, RSDError.E10 {
@Override
public Type type() {
return Type.SampleErrorScalarSub;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import dev.rsdlang.sample.client.model.ErrorData;

public record SampleErrorWithValue(String message, ErrorData.Data data) implements RSDError, RSDError.E3 {
public record SampleErrorWithValue(String message, ErrorData.Data data) implements RSDError, RSDError.E3, RSDError.E9 {
@Override
public Type type() {
return Type.SampleErrorWithValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,6 @@ public interface SampleServiceService extends BaseService {

public Result<Void, RSDError.E8> getSimpleErrorUnion();

public Result<Void, RSDError.E9> multiErrorSameCode(int errorType);

}
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ public interface ScalarSubstition_ServiceService extends BaseService {

public Result<NilResult, RSDError.$GenericError> headerListOptNull(List<MyRange> range);

public Result<Void, RSDError.E9> fail();
public Result<Void, RSDError.E10> fail();

}
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadFile", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadFile", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -124,6 +125,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadFileOpt", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadFileOpt", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -168,6 +170,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadFileOpt", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadFileOpt", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -212,6 +215,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadFileNil", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadFileNil", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -253,6 +257,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadFileOptNil", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadFileOptNil", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -300,6 +305,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadFileOptNil", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadFileOptNil", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -344,6 +350,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadBlob", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadBlob", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -385,6 +392,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadBlobOpt", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadBlobOpt", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -429,6 +437,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadBlobOpt", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadBlobOpt", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -473,6 +482,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadBlobNil", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadBlobNil", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -514,6 +524,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadBlobOptNil", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadBlobOptNil", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -561,6 +572,7 @@ private String contentType() {
this.lifecycleHook.onSuccess("uploadBlobOptNil", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("uploadBlobOptNil", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -2479,13 +2491,17 @@ public Result<RSDFile, RSDError.E3> downloadFile() {
var $rv = JDKHttpClientResponseUtils.mapFile($response);
this.lifecycleHook.onSuccess("downloadFile", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
} else if ($response.statusCode() == 400) {
var $errorData = JDKHttpClientResponseUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of downloadFile failed");
var $error = new SampleErrorWithValue($message, $errorData);
this.lifecycleHook.onError("downloadFile", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
}
if ($response.statusCode() == 400) {
if ($response.headers().firstValue("X-RSD-Error-Type").orElse("").equals("SampleErrorWithValue")) {
var $errorData = JDKHttpClientResponseUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of downloadFile failed");
var $error = new SampleErrorWithValue($message, $errorData);
this.lifecycleHook.onError("downloadFile", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
}
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("downloadFile", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down Expand Up @@ -2520,13 +2536,17 @@ public Result<RSDBlob, RSDError.E3> downloadBlob() {
var $rv = JDKHttpClientResponseUtils.mapBlob($response);
this.lifecycleHook.onSuccess("downloadBlob", $rv, this.client.createResponseAdaptable($response));
return Result.ok($rv);
} else if ($response.statusCode() == 400) {
var $errorData = JDKHttpClientResponseUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of downloadBlob failed");
var $error = new SampleErrorWithValue($message, $errorData);
this.lifecycleHook.onError("downloadBlob", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
}
if ($response.statusCode() == 400) {
if ($response.headers().firstValue("X-RSD-Error-Type").orElse("").equals("SampleErrorWithValue")) {
var $errorData = JDKHttpClientResponseUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of downloadBlob failed");
var $error = new SampleErrorWithValue($message, $errorData);
this.lifecycleHook.onError("downloadBlob", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
}
}

var $error = new RSDError.$GenericError(RSDError.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)), null);
this.lifecycleHook.onError("downloadBlob", $error, this.client.createResponseAdaptable($response));
return Result.err($error);
Expand Down
Loading
Loading