SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-796 Fix error handling for reactive input/ouput conversion

Browse Source 
Resolves #796
This commit is contained in:
Oleg Zhurakousky
2022-02-07 18:56:18 +01:00
parent 28e3b6cee2
commit 2a7db056fb
1 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -1377,10 +1377,22 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
? FunctionTypeUtils.getImmediateGenericType(type, 0) ? FunctionTypeUtils.getImmediateGenericType(type, 0)
: type; : type;
return publisher instanceof Mono return publisher instanceof Mono
? Mono.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType == null ? type : actualType)) ? Mono.from(publisher).map(v -> {
.doOnError(ex -> logger.error("Failed to convert input", (Throwable) ex)) try {
: Flux.from(publisher).map(v -> this.convertInputIfNecessary(v, actualType == null ? type : actualType)) return this.convertInputIfNecessary(v, actualType == null ? type : actualType);
.doOnError(ex -> logger.error("Failed to convert input", (Throwable) ex)); }
catch (Exception e) {
throw new IllegalStateException("Failed to convert input", e);
}
})
: Flux.from(publisher).map(v -> {
try {
return this.convertInputIfNecessary(v, actualType == null ? type : actualType);
}
catch (Exception e) {
throw new IllegalStateException("Failed to convert input", e);
}
});
} }
/* /*
@@ -1389,10 +1401,22 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Object convertOutputPublisherIfNecessary(Publisher publisher, Type type, String[] expectedOutputContentType) { private Object convertOutputPublisherIfNecessary(Publisher publisher, Type type, String[] expectedOutputContentType) {
return publisher instanceof Mono return publisher instanceof Mono
? Mono.from(publisher).map(v -> this.convertOutputIfNecessary(v, type, expectedOutputContentType)) ? Mono.from(publisher).map(v -> {
.doOnError(ex -> logger.error("Failed to convert output", (Throwable) ex)) try {
: Flux.from(publisher).map(v -> this.convertOutputIfNecessary(v, type, expectedOutputContentType)) return this.convertOutputIfNecessary(v, type, expectedOutputContentType);
.doOnError(ex -> logger.error("Failed to convert output", (Throwable) ex)); }
catch (Exception e) {
throw new IllegalStateException("Failed to convert output", e);
}
})
: Flux.from(publisher).map(v -> {
try {
return this.convertOutputIfNecessary(v, type, expectedOutputContentType);
}
catch (Exception e) {
throw new IllegalStateException("Failed to convert output", e);
}
});
} }
} }