Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SplitterMH for primitive arrays cast (#2964)

Browse Source 
* Fix SplitterMH for primitive arrays cast

The plain cast like `(Object[]) array` doesn't work for array of
primitives - fails with `ClassCastException`

* Use `ObjectUtils.toObjectArray()` instead which does a smart job to
determine a wrapper for primitive and cast into that array of types
afterwards

* * Fix Checkstyle violation
This commit is contained in:
Artem Bilan
2019-06-13 11:15:06 -04:00
committed by Gary Russell
parent 2afe115168
commit 5ad4f62499
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java
View File

@@ -34,6 +34,7 @@ import org.springframework.integration.support.AbstractIntegrationMessageBuilder
import org.springframework.integration.support.json.JacksonPresent;
import org.springframework.integration.util.FunctionIterator;
import org.springframework.messaging.Message;
import org.springframework.util.ObjectUtils;
import com.fasterxml.jackson.core.TreeNode;
import reactor.core.publisher.Flux;
@@ -62,7 +63,7 @@ public abstract class AbstractMessageSplitter extends AbstractReplyProducingMess
@Override
@SuppressWarnings("unchecked")
protected final Object handleRequestMessage(Message<?> message) {
Object result = this.splitMessage(message);
Object result = splitMessage(message);
// return null if 'null'
if (result == null) {
return null;
@@ -87,7 +88,7 @@ public abstract class AbstractMessageSplitter extends AbstractReplyProducingMess
}
}
else if (result.getClass().isArray()) {
Object[] items = (Object[]) result;
Object[] items = ObjectUtils.toObjectArray(result);
sequenceSize = items.length;
if (reactive) {
flux = Flux.fromArray(items);

12
spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java
View File

@@ -54,7 +54,7 @@ import reactor.test.StepVerifier;
public class DefaultSplitterTests {
@Test
public void splitMessageWithArrayPayload() throws Exception {
public void splitMessageWithArrayPayload() {
String[] payload = new String[] { "x", "y", "z" };
Message<String[]> message = MessageBuilder.withPayload(payload).build();
QueueChannel replyChannel = new QueueChannel();
@@ -75,7 +75,7 @@ public class DefaultSplitterTests {
}
@Test
public void splitMessageWithCollectionPayload() throws Exception {
public void splitMessageWithCollectionPayload() {
List<String> payload = Arrays.asList("x", "y", "z");
Message<List<String>> message = MessageBuilder.withPayload(payload).build();
QueueChannel replyChannel = new QueueChannel();
@@ -163,20 +163,20 @@ public class DefaultSplitterTests {
@Test
public void splitArrayPayloadReactive() {
Message<?> message = new GenericMessage<>(new String[] { "x", "y", "z" });
Message<?> message = new GenericMessage<>(new int[] { 0, 1, 2 });
FluxMessageChannel replyChannel = new FluxMessageChannel();
DefaultMessageSplitter splitter = new DefaultMessageSplitter();
splitter.setOutputChannel(replyChannel);
splitter.handleMessage(message);
Flux<String> testFlux =
Flux<Integer> testFlux =
Flux.from(replyChannel)
.map(Message::getPayload)
.cast(String.class);
.cast(Integer.class);
StepVerifier.create(testFlux)
.expectNext("x", "y", "z")
.expectNext(0, 1, 2)
.then(() ->
((Subscriber<?>) TestUtils.getPropertyValue(replyChannel, "subscribers", List.class).get(0))
.onComplete())