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

INT-651 Suppress Deprecation Warnings

Browse Source
This commit is contained in:
Gary Russell
2014-07-18 14:45:04 -04:00
parent 9858657953
commit b2f07d0116
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.support.AbstractIntegrationMessageBuilder;
import org.springframework.integration.util.Function;
import org.springframework.integration.util.FunctionIterator;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
@@ -36,6 +35,7 @@ import org.springframework.messaging.MessageHeaders;
* @author Dave Syer
* @author Artem Bilan
*/
@SuppressWarnings("deprecation")
public abstract class AbstractMessageSplitter extends AbstractReplyProducingMessageHandler {
private boolean applySequence = true;
@@ -49,7 +49,7 @@ public abstract class AbstractMessageSplitter extends AbstractReplyProducingMess
}
@Override
@SuppressWarnings({ "unchecked", "deprecation" })
@SuppressWarnings("unchecked")
protected final Object handleRequestMessage(Message<?> message) {
Object result = this.splitMessage(message);
// return null if 'null'
@@ -91,7 +91,7 @@ public abstract class AbstractMessageSplitter extends AbstractReplyProducingMess
final AtomicInteger sequenceNumber = new AtomicInteger(1);
return new FunctionIterator<Object, AbstractIntegrationMessageBuilder<?>>(iterator,
new Function<Object, AbstractIntegrationMessageBuilder<?>>() {
new org.springframework.integration.util.Function<Object, AbstractIntegrationMessageBuilder<?>>() {
@Override
public AbstractIntegrationMessageBuilder<?> apply(Object object) {
return createBuilder(object, headers, correlationId, sequenceNumber.getAndIncrement(),

6
spring-integration-core/src/main/java/org/springframework/integration/util/FunctionIterator.java
View File

@@ -30,13 +30,14 @@ public final class FunctionIterator<T, V> implements Iterator<V> {
private final Iterator<T> iterator;
@SuppressWarnings("deprecation")
private final Function<? super T, ? extends V> function;
public FunctionIterator(Iterable<T> iterable, Function<? super T, ? extends V> function) {
public FunctionIterator(Iterable<T> iterable, @SuppressWarnings("deprecation") Function<? super T, ? extends V> function) {
this(iterable.iterator(), function);
}
public FunctionIterator(Iterator<T> newIterator, Function<? super T, ? extends V> function) {
public FunctionIterator(Iterator<T> newIterator, @SuppressWarnings("deprecation") Function<? super T, ? extends V> function) {
this.iterator = newIterator;
this.function = function;
}
@@ -51,6 +52,7 @@ public final class FunctionIterator<T, V> implements Iterator<V> {
return this.iterator.hasNext();
}
@SuppressWarnings("deprecation")
@Override
public V next() {
if (this.hasNext()) {