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

INT-1195: rename correlation->group in MessageGroup and friends

Browse Source
This commit is contained in:
David Syer
2010-06-19 06:59:05 +00:00
parent 7d50eb4204
commit 87352799fb
24 changed files with 141 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTest.java
View File

@@ -123,7 +123,7 @@ public class CorrelatingMessageBarrierTest {
public boolean canRelease(MessageGroup messageGroup) {
System.out.println("Trying to release group: " + messageGroup + "\n to thread: " + Thread.currentThread());
Object correlationKey = messageGroup.getCorrelationKey();
Object correlationKey = messageGroup.getGroupId();
Semaphore lock = lockForKey(correlationKey);
System.out.println(Thread.currentThread() + " got lock: " + lock);
return lock.tryAcquire();

2
spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreReaperTests.java
View File

@@ -59,7 +59,7 @@ public class MessageStoreReaperTests {
public void execute(MessageGroupStore messageGroupStore, MessageGroup group) {
groups.add(group);
messageGroupStore.removeMessageGroup(group.getCorrelationKey());
messageGroupStore.removeMessageGroup(group.getGroupId());
}
}

4
spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java
View File

@@ -53,7 +53,7 @@ public class MessageStoreTests {
store.registerMessageGroupExpiryCallback(new MessageGroupCallback() {
public void execute(MessageGroupStore messageGroupStore, MessageGroup group) {
list.add(group.getOne().getPayload().toString());
messageGroupStore.removeMessageGroup(group.getCorrelationKey());
messageGroupStore.removeMessageGroup(group.getGroupId());
}
});
@@ -90,7 +90,7 @@ public class MessageStoreTests {
}
public void removeMessageGroup(Object correlationKey) {
if (correlationKey.equals(testMessages.getCorrelationKey())) {
if (correlationKey.equals(testMessages.getGroupId())) {
removed = true;
}
}

2
spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java
View File

@@ -119,7 +119,7 @@ public class SimpleMessageStoreTests {
store.registerMessageGroupExpiryCallback(new MessageGroupCallback() {
public void execute(MessageGroupStore messageGroupStore, MessageGroup group) {
list.add(group.getOne().getPayload().toString());
messageGroupStore.removeMessageGroup(group.getCorrelationKey());
messageGroupStore.removeMessageGroup(group.getGroupId());
}
});