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

INT-1568 removed the MessageHeaders.PREFIX constant since it's no longer necessary. Also added @ManagedOperation to the IntegrationMBeanExporter's getChannelSendRate(..) method.

Browse Source
This commit is contained in:
Mark Fisher
2010-11-18 00:03:48 -05:00
parent 9f1d9e87ce
commit f3e854b10c
14 changed files with 28 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java
View File

@@ -16,8 +16,6 @@
package org.springframework.integration.ip;
import org.springframework.integration.MessageHeaders;
/**
* Headers for Messages mapped from IP datagram packets.
*
@@ -28,9 +26,7 @@ import org.springframework.integration.MessageHeaders;
*/
public abstract class IpHeaders {
private static final String PREFIX = MessageHeaders.PREFIX;
private static final String IP = PREFIX + "ip_";
private static final String IP = "ip_";
private static final String TCP = IP + "tcp_";

15
spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java
View File

@@ -18,11 +18,8 @@ package org.springframework.integration.ip.util;
import static org.junit.Assert.assertEquals;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.integration.MessageHeaders;
/**
* @author Gary Russell
*/
@@ -37,16 +34,4 @@ public class RegexUtilsTests {
assertEquals("xxx\\$\\^\\[\\]\\{\\(\\)\\}\\+\\*\\\\\\?\\|\\.xxx", RegexUtils.escapeRegexSpecials(s));
}
/**
* And one of the ones we are actually using
*/
@Test
@Ignore // no longer relevant due to INT-1568
public void testSiPrefix () {
// protect the test in case we ever change the prefix
if ("$^[]{()}+*\\?|.".contains(MessageHeaders.PREFIX)) {
assertEquals(RegexUtils.escapeRegexSpecials(MessageHeaders.PREFIX), "\\" + MessageHeaders.PREFIX);
}
}
}