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

INT-3492: Deprecate @Payload and @Header(s)

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

Since `@Paylod` and `@Header(s)` annotations are in the Spring Framework,
there is no more need to support them in Spring Integration.

Deprecate them and leave for backward compatibility.
Will be removed in future releases.

Remove deprecated Gatewa's `#method` expression evaluation context variable

Tested `gradlew clean testall` with and without changed to the tests.

INT-3492: Add `MessagingAnnotationUtils#findMassagePartAnnotation`

Move `MessagingAnnotationUtils` to the `org.springframework.integration.util` package
This commit is contained in:
Artem Bilan
2014-08-21 22:32:47 +03:00
committed by Gary Russell
parent 162ef1f227
commit 00c404f383
57 changed files with 411 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-integration-test/src/test/java/org/springframework/integration/test/mockito/ServiceActivatorOnMockitoMockTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 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.
@@ -20,13 +20,13 @@ import static org.mockito.Mockito.verify;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.messaging.MessageChannel;
import org.springframework.integration.annotation.Header;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.PollableChannel;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -47,10 +47,12 @@ public class ServiceActivatorOnMockitoMockTests {
PollableChannel out;
public static class SingleAnnotatedMethodOnClass {
@ServiceActivator
public String move(String s) {
return s;
}
}
@Autowired
@@ -77,10 +79,13 @@ public class ServiceActivatorOnMockitoMockTests {
verify(singleMethodOnClass).move("SingleMethodOnClass");
}
@SuppressWarnings("deprecation")
public static class SingleMethodAcceptingHeaderOnClass {
public String move(@Header("s") String s) {
public String move(@org.springframework.integration.annotation.Header("s") String s) {
return s;
}
}
@Autowired
@@ -88,7 +93,9 @@ public class ServiceActivatorOnMockitoMockTests {
@Test
public void shouldInvokeMockedSingleMethodAcceptingHeaderOnClass() {
in.send(MessageBuilder.withPayload("SingleMethodAcceptingHeaderOnClass").setHeader("s", "SingleMethodAcceptingHeaderOnClass").build());
in.send(MessageBuilder.withPayload("SingleMethodAcceptingHeaderOnClass")
.setHeader("s", "SingleMethodAcceptingHeaderOnClass")
.build());
verify(singleMethodAcceptingHeaderOnClass).move("SingleMethodAcceptingHeaderOnClass");
}