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

RESOLVED - issue INT-1010, INT-1050, INT-1100

Browse Source
This commit is contained in:
David Syer
2010-04-26 16:30:22 +00:00
parent dd4afd8cb5
commit 193d9b6002
4 changed files with 38 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.integration/src/main/java/org/springframework/integration/store/MessageStore.java
View File

@@ -55,11 +55,6 @@ public interface MessageStore {
*/
Message<?> delete(UUID id);
/**
* Return all Messages currently in the MessageStore.
*/
List<Message<?>> list();
/**
* Return all Messages currently in the MessageStore that
* contain the provided correlationId header value.

79
org.springframework.integration/src/main/java/org/springframework/integration/store/SimpleMessageStore.java
View File

@@ -29,25 +29,27 @@ import org.springframework.integration.util.UpperBound;
import org.springframework.util.Assert;
/**
* Map-based implementation of {@link MessageStore} that enforces a maximum capacity.
*
* Map-based implementation of {@link MessageStore} that enforces a maximum
* capacity.
*
* @author Iwein Fuld
* @author Mark Fisher
* @since 2.0
*/
public class SimpleMessageStore implements MessageStore {
private final Map<UUID, Message<?>> map;
private final Map<UUID, Message<?>> map;
private final UpperBound upperBound;
/**
* Creates a SimpleMessageStore with a maximum size limited by the given capacity, or unlimited
* size if the given capacity is less than 1.
* Creates a SimpleMessageStore with a maximum size limited by the given
* capacity, or unlimited size if the given capacity is less than 1.
*/
public SimpleMessageStore(int capacity) {
this.map = new ConcurrentHashMap<UUID, Message<?>>();
this.upperBound = new UpperBound(capacity);
}
this.map = new ConcurrentHashMap<UUID, Message<?>>();
this.upperBound = new UpperBound(capacity);
}
/**
* Creates a SimpleMessageStore with unlimited capacity
@@ -56,48 +58,43 @@ public class SimpleMessageStore implements MessageStore {
this(0);
}
@SuppressWarnings("unchecked")
public <T> Message<T> put(Message<T> message) {
if (!upperBound.tryAcquire(0)){
throw new MessagingException(this.getClass().getSimpleName() +
" was out of capacity at, try constructing it with a larger capacity.");
public <T> Message<T> put(Message<T> message) {
if (!upperBound.tryAcquire(0)) {
throw new MessagingException(this.getClass().getSimpleName()
+ " was out of capacity at, try constructing it with a larger capacity.");
}
return (Message<T>) this.map.put(message.getHeaders().getId(), message);
}
return (Message<T>) this.map.put(message.getHeaders().getId(), message);
}
public Message<?> get(UUID key) {
return (key != null) ? this.map.get(key) : null;
}
public Message<?> get(UUID key) {
return (key != null) ? this.map.get(key) : null;
}
public List<Message<?>> list() {
return new ArrayList<Message<?>>(this.map.values());
}
public Message<?> delete(UUID key) {
public Message<?> delete(UUID key) {
if (key != null) {
upperBound.release();
return this.map.remove(key);
}
else return null;
}
else
return null;
}
public int size() {
return this.map.size();
}
public int size() {
return this.map.size();
}
public List<Message<?>> list(Object correlationKey) {
Assert.notNull(correlationKey, "'correlationKey' must not be null");
List<Message<?>> matched = new ArrayList<Message<?>>();
Collection<Message<?>> values = map.values();
for (Message<?> message : values) {
Object correlationId = message.getHeaders().getCorrelationId();
if (correlationId != null && correlationId.equals(correlationKey)) {
matched.add(message);
}
}
return matched;
}
public List<Message<?>> list(Object correlationKey) {
Assert.notNull(correlationKey, "'correlationKey' must not be null");
List<Message<?>> matched = new ArrayList<Message<?>>();
Collection<Message<?>> values = map.values();
for (Message<?> message : values) {
Object correlationId = message.getHeaders().getCorrelationId();
if (correlationId != null && correlationId.equals(correlationKey)) {
matched.add(message);
}
}
return matched;
}
}