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

SPRNET-1293 - Remove extraneous methods in implementations of NMS caching classes that use RequestTimeOut as a method parameter

Browse Source
This commit is contained in:
markpollack
2009-12-14 18:17:33 +00:00
parent f3972d09d4
commit 388c72f784
3 changed files with 14 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs
View File

@@ -167,18 +167,6 @@ namespace Spring.Messaging.Nms.Connections
}
/// <summary>
/// Creates the producer given the destinaton and requst timeout, potentially returning a cached instance.
/// </summary>
/// <param name="destination">The destination.</param>
/// <param name="requestTimeout">The request timeout.</param>
/// <returns>The message producer</returns>
public IMessageProducer CreateProducer(IDestination destination, TimeSpan requestTimeout)
{
LOG.Warn("RequestTimeout for Producers created from CachedSession not yet supported");
return CreateProducer(destination, requestTimeout);
}
/// <summary>
/// If have not yet reached session cache size, cache the session, otherwise
/// dispose of all cached message producers and close the session.
@@ -280,18 +268,6 @@ namespace Spring.Messaging.Nms.Connections
}
/// <summary>
/// Creates the consumer for the given destinaton and request timeout, potentially returning a cached instance.
/// </summary>
/// <param name="destination">The destination.</param>
/// <param name="requestTimeout">The request timeout.</param>
/// <returns>A message consumer</returns>
public IMessageConsumer CreateConsumer(IDestination destination, TimeSpan requestTimeout)
{
LOG.Warn("RequestTimeout not yet supported in CachedSesion.");
return CreateConsumer(destination, null, false, null);
}
/// <summary>
/// Creates the consumer, potentially returning a cached instance.
/// </summary>
@@ -303,19 +279,6 @@ namespace Spring.Messaging.Nms.Connections
return CreateConsumer(destination, selector, false, null);
}
/// <summary>
/// Creates the consumer, potentially returning a cached instance.
/// </summary>
/// <param name="destination">The destination.</param>
/// <param name="selector">The selector.</param>
/// <param name="requestTimeout">The request timeout.</param>
/// <returns>A message consumer.</returns>
public IMessageConsumer CreateConsumer(IDestination destination, string selector, TimeSpan requestTimeout)
{
LOG.Warn("RequestTimeout not yet supported in CachedSesion.");
return CreateConsumer(destination, selector, false, null);
}
/// <summary>
/// Creates the consumer, potentially returning a cached instance.
/// </summary>
@@ -328,22 +291,6 @@ namespace Spring.Messaging.Nms.Connections
return CreateConsumer(destination, selector, noLocal, null);
}
/// <summary>
/// Creates the consumer, potentially returning a cached instance.
/// </summary>
/// <param name="destination">The destination.</param>
/// <param name="selector">The selector.</param>
/// <param name="noLocal">if set to <c>true</c> [no local].</param>
/// <param name="requestTimeout">The request timeout.</param>
/// <returns>A message consumer</returns>
public IMessageConsumer CreateConsumer(IDestination destination, string selector, bool noLocal,
TimeSpan requestTimeout)
{
LOG.Warn("RequestTimeout not yet supported in CachedSesion.");
return CreateConsumer(destination, selector, noLocal, null);
}
/// <summary>
/// Creates the durable consumer, potentially returning a cached instance.
/// </summary>
@@ -365,42 +312,19 @@ namespace Spring.Messaging.Nms.Connections
}
}
/// <summary>
/// Creates the durable consumer, potentially returning a cached instance.
/// </summary>
/// <param name="destination">The destination.</param>
/// <param name="name">The name.</param>
/// <param name="selector">The selector.</param>
/// <param name="noLocal">if set to <c>true</c> [no local].</param>
/// <param name="requestTimeout">The request timeout.</param>
/// <returns>A message consumer</returns>
public IMessageConsumer CreateDurableConsumer(ITopic destination, string name, string selector, bool noLocal,
TimeSpan requestTimeout)
{
LOG.Warn("RequestTimeout not yet supported in CachedSesion.");
return CreateDurableConsumer(destination, name, selector, noLocal);
}
/// <summary>
/// Deletes the durable consumer.
/// </summary>
/// <param name="name">The name.</param>
public void DeleteDurableConsumer(string name)
/// <param name="durableSubscriptionName">The name of the durable subscription.</param>
public void DeleteDurableConsumer(string durableSubscriptionName)
{
throw new NotImplementedException();
if (shouldCacheConsumers)
{
throw new InvalidOperationException("Deleting of durable consumers is not supported when caching of consumers is enabled");
}
target.DeleteDurableConsumer(durableSubscriptionName);
}
/// <summary>
/// Deletes the durable consumer.
/// </summary>
/// <param name="name">The name.</param>
/// <param name="requestTimeout">The request timeout.</param>
public void DeleteDurableConsumer(string name, TimeSpan requestTimeout)
{
throw new NotImplementedException();
}
/// <summary>
/// Creates the consumer.
@@ -408,14 +332,14 @@ namespace Spring.Messaging.Nms.Connections
/// <param name="destination">The destination.</param>
/// <param name="selector">The selector.</param>
/// <param name="noLocal">if set to <c>true</c> [no local].</param>
/// <param name="subscription">The subscription.</param>
/// <param name="durableSubscriptionName">The durable subscription name.</param>
/// <returns></returns>
protected IMessageConsumer CreateConsumer(IDestination destination, string selector, bool noLocal, string subscription)
protected IMessageConsumer CreateConsumer(IDestination destination, string selector, bool noLocal, string durableSubscriptionName)
{
this.transactionOpen = true;
if (shouldCacheConsumers)
{
return GetCachedConsumer(destination, selector, noLocal, subscription);
return GetCachedConsumer(destination, selector, noLocal, durableSubscriptionName);
}
else
{
@@ -423,9 +347,9 @@ namespace Spring.Messaging.Nms.Connections
}
}
private IMessageConsumer GetCachedConsumer(IDestination destination, string selector, bool noLocal, string subscription)
private IMessageConsumer GetCachedConsumer(IDestination destination, string selector, bool noLocal, string durableSubscriptionName)
{
object cacheKey = new ConsumerCacheKey(destination, selector, noLocal, null);
object cacheKey = new ConsumerCacheKey(destination, selector, noLocal, durableSubscriptionName);
IMessageConsumer consumer = (IMessageConsumer)cachedConsumers[cacheKey];
if (consumer != null)
{
@@ -438,8 +362,8 @@ namespace Spring.Messaging.Nms.Connections
{
if (destination is ITopic)
{
consumer = (subscription != null
? target.CreateDurableConsumer((ITopic)destination, subscription, selector, noLocal)
consumer = (durableSubscriptionName != null
? target.CreateDurableConsumer((ITopic)destination, durableSubscriptionName, selector, noLocal)
: target.CreateConsumer(destination, selector, noLocal));
}
else

18
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs
View File

@@ -252,24 +252,6 @@ namespace Spring.Messaging.Nms.Connections
return session;
}
/// <summary>
/// Template method for obtaining a (potentially cached) Session.
/// </summary>
/// <param name="con">The connection to operate on.</param>
/// <param name="mode">The session ack mode.</param>
/// <param name="requestTimeout">The request timeout.</param>
/// <returns>
/// the Session to use, or <code>null</code> to indicate
/// creation of a raw standard Session
/// </returns>
public override ISession GetSession(IConnection con, AcknowledgementMode mode, TimeSpan requestTimeout)
{
ISession session = GetSession(con, mode);
LOG.Warn("RequestTimeout parameter not yet supported in CachingConnectionFactory");
return session;
}
/// <summary>
/// Wraps the given Session so that it delegates every method call to the target session but
/// adapts close calls. This is useful for allowing application code to

15
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
View File

@@ -325,21 +325,6 @@ namespace Spring.Messaging.Nms.Connections
return null;
}
/// <summary>
/// Template method for obtaining a (potentially cached) Session.
/// </summary>
/// <param name="con">The connection to operate on.</param>
/// <param name="mode">The session ack mode.</param>
/// <param name="requestTimeout">The request timeout.</param>
/// <returns>
/// the Session to use, or <code>null</code> to indicate
/// creation of a raw standard Session
/// </returns>
public virtual ISession GetSession(IConnection con, AcknowledgementMode mode, TimeSpan requestTimeout)
{
return null;
}
/// <summary>
/// reate a JMS Connection via this template's ConnectionFactory.
/// </summary>