Skip to content

Add batch message splitting and unit tests #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add batch message splitting and unit tests #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions .../main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
* @author Roman Samarev
* @author Soby Chacko
* @author Chris Bono
* @author 2tsumo-hitori
*/
public class SimpleFunctionRegistry implements FunctionRegistry {
protected Log logger = LogFactory.getLog(this.getClass());
Expand Down Expand Up @@ -419,6 +420,8 @@ public class FunctionInvocationWrapper implements Function<Object, Object>, Cons

protected boolean wrapped;

private boolean enableSplitting = false;

private final ThreadLocal<Message<Object>> unconvertedResult = new ThreadLocal<>();

private PostProcessingFunction postProcessor;
Expand Down Expand Up @@ -575,6 +578,14 @@ public Class<?> getRawInputType() {
return this.inputType == null ? null : FunctionTypeUtils.getRawType(this.inputType);
}

public boolean isEnableSplitting() {
return enableSplitting;
}

public void setEnableSplitting(boolean enableSplitting) {
this.enableSplitting = enableSplitting;
}

/**
*
*/
Expand Down Expand Up @@ -815,6 +826,9 @@ private Object enrichInvocationResultIfNecessary(Object input, Object result) {
if (functionInvocationHelper != null && CloudEventMessageUtils.isCloudEvent(((Message) input))) {
result = functionInvocationHelper.postProcessResult(result, (Message) input);
}
else if (this.enableSplitting && !FunctionTypeUtils.isCollectionOfMessage(this.outputType)) {
result = ((Collection<?>) result).stream().map(it -> MessageBuilder.withPayload(it).copyHeaders(sanitizeHeaders(((Message) input).getHeaders())).build()).toList();
}
else if (!FunctionTypeUtils.isCollectionOfMessage(this.outputType)) {
result = MessageBuilder.withPayload(result).copyHeaders(this.sanitizeHeaders(((Message) input).getHeaders())).build();
}
Expand Down Expand Up @@ -1266,6 +1280,9 @@ else if (convertedOutput instanceof Message) {
else if (convertedOutput instanceof Collection && this.isOutputTypeMessage()) {
convertedOutput = this.convertMultipleOutputValuesIfNecessary(convertedOutput, ObjectUtils.isEmpty(contentType) ? null : contentType);
}
else if (convertedOutput instanceof Collection && this.isEnableSplitting()) {
convertedOutput = this.convertMultipleOutputValuesIfNecessary(convertedOutput, ObjectUtils.isEmpty(contentType) ? null : contentType);
}
else if (ObjectUtils.isArray(convertedOutput) && !(convertedOutput instanceof byte[])) {
convertedOutput = this.convertMultipleOutputValuesIfNecessary(convertedOutput, ObjectUtils.isEmpty(contentType) ? null : contentType);
}
Expand Down
42 changes: 42 additions & 0 deletions ...springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,38 @@ public void testConcurrencyOnLookup() throws Exception {
assertThat(counter.get()).isEqualTo(100);
}

@SuppressWarnings("rawtypes")
@Test
void useBatchMessageSplitterTest() {
FunctionCatalog functionCatalog = this.configureCatalog(BatchMessageSplitterConfiguration.class);
FunctionInvocationWrapper function = functionCatalog.lookup("upperCase", "application/json");

function.setEnableSplitting(true);

List payload = List.of("2tsumo", "-", "hitori");

List result = (List) function.apply(MessageBuilder.withPayload(payload).setHeader(MessageHeaders.CONTENT_TYPE, "application/json").build());

assertThat(((Collection) result)).isNotEmpty();
assertThat(((Message) (result.get(0))).getPayload()).isEqualTo("\"2TSUMO\"".getBytes(StandardCharsets.UTF_8));
assertThat(((Message) (result.get(1))).getPayload()).isEqualTo("\"-\"".getBytes(StandardCharsets.UTF_8));
assertThat(((Message) (result.get(2))).getPayload()).isEqualTo("\"HITORI\"".getBytes(StandardCharsets.UTF_8));
}

@SuppressWarnings("rawtypes")
@Test
void noUseBatchMessageSplitterTest() {
FunctionCatalog functioncatalog = this.configureCatalog(BatchMessageSplitterConfiguration.class);
FunctionInvocationWrapper function = functioncatalog.lookup("upperCase", "application/json");

function.setEnableSplitting(false);

List payload = List.of("2tsumo", "-", "hitori");

Message result = (Message) function.apply(MessageBuilder.withPayload(payload).setHeader(MessageHeaders.CONTENT_TYPE, "application/json").build());
assertThat(result.getPayload()).isEqualTo("[\"2TSUMO\",\"-\",\"HITORI\"]".getBytes(StandardCharsets.UTF_8));
}

@EnableAutoConfiguration
public static class PojoToMessageFunctionCompositionConfiguration {

Expand Down Expand Up @@ -1608,4 +1640,14 @@ public Function<Message<?>, Message<?>> myFunction() {
return msg -> msg;
}
}

@EnableAutoConfiguration
@Configuration
protected static class BatchMessageSplitterConfiguration {

@Bean
public Function<Message<List<String>>, List<String>> upperCase() {
return messages -> messages.getPayload().stream().map(String::toUpperCase).toList();
}
}
}