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

INT-4199: Fix Asserts with no Message

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4199

MQTT and JDBC.

Conflicts:
	spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java
Resolved.
This commit is contained in:
Gary Russell
2017-01-03 12:28:17 -05:00
committed by Artem Bilan
parent 8fd9290509
commit 3ce1fcb110
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -691,7 +691,9 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
protected Message<?> doPollForMessage(String groupIdKey) {
List<Message<?>> messages = this.jdbcTemplate.query(getQuery(Query.POLL_FROM_GROUP), this.mapper,
groupIdKey, this.region, groupIdKey, this.region);
Assert.isTrue(messages.size() == 0 || messages.size() == 1);
if (messages.size() > 1) {
throw new IllegalStateException("The query must return zero or 1 row; got " + messages.size() + " rows");
}
if (messages.size() > 0) {
return messages.get(0);
}

6
spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -600,7 +600,9 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto
}
Assert.isTrue(messages.size() == 0 || messages.size() == 1);
if (messages.size() > 1) {
throw new IllegalStateException("The query must return zero or 1 row; got " + messages.size() + " rows");
}
if (messages.size() > 0) {
final Message<?> message = messages.get(0);

14
spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -132,7 +132,10 @@ public class DefaultPahoMessageConverter implements MqttMessageConverter, BeanFa
@Override
public Message<?> toMessage(Object mqttMessage, MessageHeaders headers) {
Assert.isInstanceOf(MqttMessage.class, mqttMessage);
if (!(mqttMessage instanceof MqttMessage)) {
throw new IllegalArgumentException("This converter can only convert an 'MqttMessage'; received: "
+ mqttMessage.getClass().getName());
}
return toMessage(null, (MqttMessage) mqttMessage);
}
@@ -193,7 +196,12 @@ public class DefaultPahoMessageConverter implements MqttMessageConverter, BeanFa
*/
protected byte[] messageToMqttBytes(Message<?> message) {
Object payload = message.getPayload();
Assert.isTrue(payload instanceof byte[] || payload instanceof String);
if (!(payload instanceof byte[] || payload instanceof String)) {
throw new IllegalArgumentException(
"This default converter can only handle 'byte[]' or 'String' payloads; consider adding a "
+ "transformer to your flow definition, or subclass this converter for "
+ payload.getClass().getName() + " payloads");
}
byte[] payloadBytes;
if (payload instanceof String) {
try {