IServiceOriented.ServiceBus/DeliveryException.cs IServiceOriented.ServiceBus/GlobalSuppressions.cs @@ -4,8 +4,8 @@ <SharedProject>True</SharedProject> <Stylesheet Apply="False">c:\program files\microsoft fxcop 1.36\Xml\FxCopReport.xsl</Stylesheet> <SaveMessages> - <Project Status="Active, Excluded" NewOnly="False" /> - <Report Status="Active" NewOnly="False" /> + <Project Status="None" NewOnly="False" /> + <Report Status="None" NewOnly="False" /> </SaveMessages> <ProjectFile Compress="True" DefaultTargetCheck="True" DefaultRuleCheck="True" SaveByRuleGroup="" Deterministic="True" /> <EnableMultithreadedLoad>True</EnableMultithreadedLoad> @@ -16,7 +16,7 @@ <Spelling Locale="en-US" /> <OverrideRuleVisibilities>False</OverrideRuleVisibilities> <CustomDictionaries SearchFxCopDir="True" SearchUserProfile="True" SearchProjectDir="True" /> - <SearchGlobalAssemblyCache>False</SearchGlobalAssemblyCache> + <SearchGlobalAssemblyCache>True</SearchGlobalAssemblyCache> <DeadlockDetectionTimeout>120</DeadlockDetectionTimeout> <IgnoreGeneratedCode>False</IgnoreGeneratedCode> </ProjectOptions> @@ -38,82 +38,5 @@ <Groups /> <Settings /> </Rules> - <FxCopReport Version="1.36"> - <Targets> - <Target Name="$(ProjectDir)/IServiceOriented.ServiceBus/bin/Debug/IServiceOriented.ServiceBus.dll"> - <Modules> - <Module Name="iserviceoriented.servicebus.dll"> - <Namespaces> - <Namespace Name="IServiceOriented.ServiceBus"> - <Types> - <Type Name="IMessageDeliveryQueue"> - <Messages> - <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2008-08-29 02:32:26Z"> - <Issue Name="TypeNoAlternate"> - <Item>'IMessageDeliveryQueue'</Item> - <Item>Queue</Item> - </Issue> - </Message> - </Messages> - </Type> - <Type Name="MsmqMessageDeliveryQueue"> - <Messages> - <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2008-08-29 02:32:26Z"> - <Issue Name="TypeNoAlternate"> - <Item>'MsmqMessageDeliveryQueue'</Item> - <Item>Queue</Item> - </Issue> - </Message> - </Messages> - </Type> - <Type Name="ServiceBusRuntime"> - <Members> - <Member Name="#DeliverOne(IServiceOriented.ServiceBus.ServiceBusRuntime+DeliveryWork,IServiceOriented.ServiceBus.IMessageDeliveryQueue)"> - <Messages> - <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2008-08-29 02:32:26Z"> - <Issue> - <Item>'ServiceBusRuntime.DeliverOne(ServiceBusRuntime.DeliveryWork, IMessageDeliveryQueue)'</Item> - <Item>'Exception'</Item> - </Issue> - </Message> - </Messages> - </Member> - <Member Name="#DoSafely(System.Action)"> - <Messages> - <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2008-08-29 02:32:26Z"> - <Issue> - <Item>'ServiceBusRuntime.DoSafely(Action)'</Item> - <Item>'Exception'</Item> - </Issue> - </Message> - </Messages> - </Member> - <Member Name="#DoSafely`1(System.Action`1<!!0>,!!0)"> - <Messages> - <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2008-08-29 02:32:26Z"> - <Issue> - <Item>'ServiceBusRuntime.DoSafely<T>(Action<T>, T)'</Item> - <Item>'Exception'</Item> - </Issue> - </Message> - </Messages> - </Member> - </Members> - </Type> - </Types> - </Namespace> - </Namespaces> - </Module> - </Modules> - </Target> - </Targets> - <Rules> - <Rule TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031"> - <Resolution Name="Default">Modify {0} to catch a more specific exception than {1} or rethrow the exception.</Resolution> - </Rule> - <Rule TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711"> - <Resolution Name="TypeNoAlternate">Rename type name {0} so that it does not end in '{1}'.</Resolution> - </Rule> - </Rules> - </FxCopReport> + <FxCopReport Version="1.36" /> </FxCopProject> CodeReview.FxCop @@ -41,7 +41,7 @@ namespace IServiceOriented.ServiceBus.Samples.Chat } [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single, ConfigurationName = "ChatServerOut")] - [AutoSubscribe("Autosubscribed", "ChatClientOut", typeof(IChatService), DispatcherType = typeof(WcfDispatcherWithUsernameCredentials))] + [AutoSubscribe(Name = "Autosubscribed", ConfigurationName = "ChatClientOut", ContractType = typeof(IChatService), DispatcherType = typeof(WcfDispatcherWithUsernameCredentials))] public class ChatClientService : IChatService { #region IChatService Members IServiceOriented.ServiceBus.Samples.Chat/ChatClient.cs @@ -30,8 +30,7 @@ namespace IServiceOriented.ServiceBus.UnitTests { string message = "echo this"; - MessageDelivery[] output = null; - runtime.Publish(new PublishRequest(typeof(void), "Echo", message), PublishWait.Timeout, TimeSpan.FromSeconds(10), out output); + MessageDelivery[] output = runtime.Publish(new PublishRequest(typeof(void), "Echo", message), PublishWait.Timeout, TimeSpan.FromSeconds(10)); Assert.IsNotNull(output); Assert.AreEqual(1, output.Length); IServiceOriented.ServiceBus.UnitTests/TestRequestResponse.cs @@ -66,7 +66,7 @@ namespace IServiceOriented.ServiceBus set; } - ServiceHostBase ServiceHost + public ServiceHostBase ServiceHost { get; set; @@ -76,31 +76,14 @@ namespace IServiceOriented.ServiceBus #endregion } - public class AutoSubscribe : Attribute, IServiceBehavior + [AttributeUsage(AttributeTargets.Class)] + public sealed class AutoSubscribeAttribute : Attribute, IServiceBehavior { - public AutoSubscribe() + public AutoSubscribeAttribute() { UnsubscribeOnClosing = true; } - public AutoSubscribe(string name, string configurationName, Type contractType) - : this() - { - Name = name; - ConfigurationName = configurationName; - ContractType = contractType; - } - - public AutoSubscribe(Guid subscriptionId, string name, string configurationName, Type contractType) - : this() - { - SubscriptionId = subscriptionId; - Name = name; - ConfigurationName = configurationName; - ContractType = contractType; - } - - #region IServiceBehavior Members IServiceOriented.ServiceBus/AutoSubscribeBehavior.cs @@ -11,12 +11,13 @@ namespace IServiceOriented.ServiceBus.Collections /// </summary> /// <typeparam name="K">Key type</typeparam> /// <typeparam name="V">Value type</typeparam> - public interface IReadOnlyDictionary<K,V> : IEnumerable<KeyValuePair<K,V>> + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")] + public interface IReadOnlyDictionary<TKey,TValue> : IEnumerable<KeyValuePair<TKey,TValue>> { /// <summary> /// Get the keys associated with this dictionary instance. /// </summary> - IEnumerable<K> Keys + IEnumerable<TKey> Keys { get; } @@ -24,7 +25,7 @@ namespace IServiceOriented.ServiceBus.Collections /// <summary> /// Get the values contained by this dictionary instance. /// </summary> - IEnumerable<V> Values + IEnumerable<TValue> Values { get; } @@ -32,7 +33,7 @@ namespace IServiceOriented.ServiceBus.Collections /// <summary> /// Get the value associated with a specific key. /// </summary> - V this[K key] + TValue this[TKey key] { get; } @@ -48,11 +49,11 @@ namespace IServiceOriented.ServiceBus.Collections /// <summary> /// Check to see if the dictionary contains a specific key. /// </summary> - bool ContainsKey(K key); + bool ContainsKey(TKey key); /// <summary> /// Check to see if the dictionary contains a specific key value pair. /// </summary> - bool Contains(KeyValuePair<K, V> value); + bool Contains(KeyValuePair<TKey, TValue> value); } @@ -64,9 +65,9 @@ namespace IServiceOriented.ServiceBus.Collections /// <summary> /// Convert a read only dictionary to a writeable dictionary. /// </summary> - public static Dictionary<K, V> ToDictionary<K,V>(this IReadOnlyDictionary<K, V> readOnlyDictionary) + public static Dictionary<TKey, TValue> ToDictionary<TKey,TValue>(this IReadOnlyDictionary<TKey, TValue> readOnlyDictionary) { - Dictionary<K, V> dict = new Dictionary<K, V>(); + Dictionary<TKey, TValue> dict = new Dictionary<TKey, TValue>(); foreach (var kv in readOnlyDictionary) { dict.Add(kv.Key, kv.Value); @@ -77,7 +78,7 @@ namespace IServiceOriented.ServiceBus.Collections /// <summary> /// Convert a dictionary to a read only dictionary. /// </summary> - public static ReadOnlyDictionary<K, V> MakeReadOnly<K, V>(this IDictionary<K, V> dictionary) + public static ReadOnlyDictionary<TKey, TValue> MakeReadOnly<TKey, TValue>(this IDictionary<TKey, TValue> dictionary) { return dictionary.MakeReadOnly(false); } @@ -86,9 +87,9 @@ namespace IServiceOriented.ServiceBus.Collections /// Convert a dictionary to a read only dictionary. /// </summary> /// <param name="copy">Specifies if the dictionary should be copied (true) or wrapped (false).</param> - public static ReadOnlyDictionary<K, V> MakeReadOnly<K, V>(this IDictionary<K, V> dictionary, bool copy) + public static ReadOnlyDictionary<TKey, TValue> MakeReadOnly<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, bool copy) { - return new ReadOnlyDictionary<K, V>(dictionary, copy); + return new ReadOnlyDictionary<TKey, TValue>(dictionary, copy); } } IServiceOriented.ServiceBus/Collections/IReadOnlyDictionary.cs @@ -13,42 +13,44 @@ namespace IServiceOriented.ServiceBus.Collections /// </summary> /// <typeparam name="K">Key type</typeparam> /// <typeparam name="V">Value type</typeparam> - [Serializable] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix"), Serializable] [CollectionDataContract] - public class ReadOnlyDictionary<K, V> : IReadOnlyDictionary<K, V> + public class ReadOnlyDictionary<TKey, TValue> : IReadOnlyDictionary<TKey, TValue> { - IDictionary<K, V> _dictionary; + IDictionary<TKey, TValue> _dictionary; public ReadOnlyDictionary() - : this(new Dictionary<K,V>(), false) + : this(new Dictionary<TKey,TValue>(), false) { } - public ReadOnlyDictionary(IEnumerable<KeyValuePair<K, V>> pairs) + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")] + public ReadOnlyDictionary(IEnumerable<KeyValuePair<TKey, TValue>> pairs) { - _dictionary = new Dictionary<K, V>(); - foreach (KeyValuePair<K, V> p in pairs) + _dictionary = new Dictionary<TKey, TValue>(); + foreach (KeyValuePair<TKey, TValue> p in pairs) { _dictionary.Add(p); } } - public ReadOnlyDictionary(IDictionary<K, V> from) + public ReadOnlyDictionary(IDictionary<TKey, TValue> from) : this(from, false) { } - private void Add(KeyValuePair<K,V> pair) + + private void Add(KeyValuePair<TKey,TValue> pair) { _dictionary.Add(pair.Key, pair.Value); } - public ReadOnlyDictionary(IDictionary<K, V> from, bool copy) + public ReadOnlyDictionary(IDictionary<TKey, TValue> from, bool copy) { if (copy) { - _dictionary = new Dictionary<K, V>(from); + _dictionary = new Dictionary<TKey, TValue>(from); } else { @@ -58,17 +60,17 @@ namespace IServiceOriented.ServiceBus.Collections #region IReadOnlyDictionary<K,V> Members - public IEnumerable<K> Keys + public IEnumerable<TKey> Keys { get { return _dictionary.Keys; } } - public IEnumerable<V> Values + public IEnumerable<TValue> Values { get { return _dictionary.Values; } } - public V this[K key] + public TValue this[TKey key] { get { return _dictionary[key]; } } @@ -78,17 +80,17 @@ namespace IServiceOriented.ServiceBus.Collections get { return _dictionary.Count; } } - public bool ContainsKey(K key) + public bool ContainsKey(TKey key) { return _dictionary.ContainsKey(key); } - public bool Contains(KeyValuePair<K, V> value) + public bool Contains(KeyValuePair<TKey, TValue> value) { return _dictionary.Contains(value); } - public IEnumerator<KeyValuePair<K, V>> GetEnumerator() + public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator() { return _dictionary.GetEnumerator(); } IServiceOriented.ServiceBus/Collections/ReadOnlyDictionary.cs @@ -91,7 +91,7 @@ namespace IServiceOriented.ServiceBus.Data string line = null; while ((line = scriptReader.ReadLine()) != null) { - if (String.Compare(line.Trim(), "go", StringComparison.InvariantCultureIgnoreCase) == 0) + if (String.Compare(line.Trim(), "go", StringComparison.OrdinalIgnoreCase) == 0) { create.CommandText = commandBuilder.ToString(); create.ExecuteNonQuery(); IServiceOriented.ServiceBus/Data/SqlSubscriptionDB.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Collections.ObjectModel; namespace IServiceOriented.ServiceBus.Delivery { @@ -12,13 +13,13 @@ namespace IServiceOriented.ServiceBus.Delivery } - public CorrelationMessageFilter(string[] correlationIds) + public CorrelationMessageFilter(IEnumerable<string> correlationIds) { - CorrelationIds = correlationIds; + CorrelationIds = new ReadOnlyCollection<string>(correlationIds.ToList()); } - public string[] CorrelationIds + public ReadOnlyCollection<string> CorrelationIds { get; private set; IServiceOriented.ServiceBus/Delivery/CorrelationMessageFilter.cs @@ -15,10 +15,17 @@ namespace IServiceOriented.ServiceBus.Delivery { public override void Deliver(MessageDelivery delivery) { - SubscriptionEndpoint endpoint = Runtime.GetSubscription(delivery.SubscriptionEndpointId); - if (endpoint != null) // subscription may be removed + try { - endpoint.Dispatcher.Dispatch(delivery); + SubscriptionEndpoint endpoint = Runtime.GetSubscription(delivery.SubscriptionEndpointId); + if (endpoint != null) // subscription may be removed + { + endpoint.Dispatcher.Dispatch(delivery); + } + } + catch(Exception ex) + { + throw new DeliveryException("Unhandled exception while attempting to deliver the message", ex); } } } IServiceOriented.ServiceBus/Delivery/DirectDeliveryCore.cs @@ -12,6 +12,7 @@ using IServiceOriented.ServiceBus.Collections; using System.Runtime.Serialization.Formatters.Binary; using System.ServiceModel; using IServiceOriented.ServiceBus.Delivery.Formatters; +using System.Globalization; namespace IServiceOriented.ServiceBus.Delivery.Formatters { @@ -47,7 +48,7 @@ namespace IServiceOriented.ServiceBus.Delivery.Formatters { MessageDelivery delivery = obj as MessageDelivery; - using (StringWriter writer = new StringWriter()) + using (StringWriter writer = new StringWriter(CultureInfo.InvariantCulture)) { System.ServiceModel.Channels.Message msg = MessageDeliveryConverter.ToMessage(delivery); IServiceOriented.ServiceBus/Delivery/Formatters/MessageDeliveryFormatter.cs @@ -5,6 +5,7 @@ using System.Text; namespace IServiceOriented.ServiceBus.Delivery { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix")] public interface IMessageDeliveryQueue { void Enqueue(MessageDelivery value); IServiceOriented.ServiceBus/Delivery/IMessageDeliveryQueue.cs @@ -16,6 +16,7 @@ namespace IServiceOriented.ServiceBus.Delivery /// <summary> /// Provides support for queuing messages using MSMQ /// </summary> + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Msmq")] public class MsmqMessageDeliveryQueue : IMessageDeliveryQueue, IDisposable { public MsmqMessageDeliveryQueue(string path) IServiceOriented.ServiceBus/Delivery/MsmqMessageDeliveryQueue.cs @@ -28,7 +28,7 @@ namespace IServiceOriented.ServiceBus.Delivery } - public class DeliveryWork + protected class DeliveryWork { public DeliveryWork(CommittableTransaction transaction, MessageDelivery delivery, Semaphore deliverySemaphore) { @@ -175,7 +175,7 @@ namespace IServiceOriented.ServiceBus.Delivery { try { - DoSafely(() => DeliverOne((DeliveryWork)deliverWork, _retryQueue ?? _messageDeliveryQueue, _failureQueue)); + DoSafely(() => DeliverOne((DeliveryWork)deliverWork)); } finally { @@ -258,7 +258,7 @@ namespace IServiceOriented.ServiceBus.Delivery } } - protected void DeliverOne(DeliveryWork work, IMessageDeliveryQueue retryQueue, IMessageDeliveryQueue failQueue) + protected void DeliverOne(DeliveryWork work) { System.Transactions.Transaction.Current = work.Transaction; try @@ -277,7 +277,7 @@ namespace IServiceOriented.ServiceBus.Delivery { System.Diagnostics.Debug.WriteLine("Time to process is " + mDelay + " milliseconds away. Requeuing in " + FUTURE_SLEEP_MS); Thread.Sleep(FUTURE_SLEEP_MS); // Sleep briefly in case we are in a loop of future messages, should be a little smarter - Requeue(delivery); + QueueRetry(delivery); return; } } @@ -298,7 +298,7 @@ namespace IServiceOriented.ServiceBus.Delivery } else { - System.Diagnostics.Debug.WriteLine(String.Format("Subscription {0} no longer exists. Skipping delivery.", delivery.SubscriptionEndpointId)); + System.Diagnostics.Debug.WriteLine(String.Format(CultureInfo.InvariantCulture, "Subscription {0} no longer exists. Skipping delivery.", delivery.SubscriptionEndpointId)); } } @@ -322,6 +322,8 @@ namespace IServiceOriented.ServiceBus.Delivery NotifyFailure(work.Delivery, !retry); work.Transaction.Commit(); + + throw new DeliveryException("Unhandled exception while attempting to deliver a message.", ex); } } } @@ -337,7 +339,7 @@ namespace IServiceOriented.ServiceBus.Delivery _messageDeliveryQueue.Enqueue(delivery); } - protected void Requeue(MessageDelivery delivery) + protected void QueueRetry(MessageDelivery delivery) { MessageDelivery retryDelivery = delivery.CreateRetry(false, DateTime.Now.AddMilliseconds((_exponentialBackOff ? (_retryDelayMS * delivery.RetryCount * delivery.RetryCount) : _retryDelayMS))); (_retryQueue ?? _messageDeliveryQueue).Enqueue(retryDelivery); @@ -362,7 +364,7 @@ namespace IServiceOriented.ServiceBus.Delivery { action(); } - catch (Exception ex) + catch (DeliveryException ex) { System.Diagnostics.Trace.TraceError("UNHANDLED EXCEPTION: " + ex); NotifyUnhandledException(ex, false); @@ -377,7 +379,7 @@ namespace IServiceOriented.ServiceBus.Delivery action(value); clean = true; } - catch (Exception ex) + catch (DeliveryException ex) { System.Diagnostics.Trace.TraceError("UNHANDLED EXCEPTION: " + ex); NotifyUnhandledException(ex, false); IServiceOriented.ServiceBus/Delivery/QueuedDeliveryCore.cs @@ -21,7 +21,7 @@ namespace IServiceOriented.ServiceBus.Dispatchers } - public TransformationDispatcher(SubscriptionEndpoint endpoint) : base(endpoint) + protected TransformationDispatcher(SubscriptionEndpoint endpoint) : base(endpoint) { } @@ -38,7 +38,7 @@ namespace IServiceOriented.ServiceBus.Dispatchers /// </summary> public const string TransformedByKeyName = "TransformedBy"; - public class TransformationList : ReadOnlyCollection<string> + private class TransformationList : ReadOnlyCollection<string> { public TransformationList() : base (new string[0] ) { IServiceOriented.ServiceBus/Dispatchers/TransformationDispatcher.cs @@ -80,10 +80,10 @@ namespace IServiceOriented.ServiceBus.Dispatchers { // TODO: Clean this up. Creating channel factory for each call is expensive Type channelType = typeof(ChannelFactory<>).MakeGenericType(Endpoint.ContractType); - object factory = Activator.CreateInstance(channelType, Endpoint.ConfigurationName); - ((ChannelFactory)factory).Endpoint.Address = new EndpointAddress(Endpoint.Address); + ChannelFactory factory = (ChannelFactory)Activator.CreateInstance(channelType, Endpoint.ConfigurationName); + factory.Endpoint.Address = new EndpointAddress(Endpoint.Address); - ApplySecurityContext(messageDelivery, (ChannelFactory)factory); + ApplySecurityContext(messageDelivery, factory); IClientChannel proxy = (IClientChannel)channelType.GetMethod("CreateChannel", new Type[] { }).Invoke(factory, new object[] { }); bool success = false; @@ -150,6 +150,7 @@ namespace IServiceOriented.ServiceBus.Dispatchers public Dictionary<string, MethodInfo> MethodLookup; } + [NonSerialized] ActionLookup _lookup; public static MessageFilter CreateMessageFilter(Type interfaceType) IServiceOriented.ServiceBus/Dispatchers/WcfDispatcher.cs @@ -25,6 +25,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -33,6 +34,7 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug with Scripting|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -43,6 +45,8 @@ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> <ErrorReport>prompt</ErrorReport> + <RunCodeAnalysis>true</RunCodeAnalysis> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release with Scripting|AnyCPU' "> <OutputPath>bin\Release with Scripting\</OutputPath> @@ -53,6 +57,7 @@ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> <ErrorReport>prompt</ErrorReport> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> @@ -86,10 +91,12 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="DeliveryException.cs" /> <Compile Include="Dispatchers\ActionDispatcher.cs" /> <Compile Include="Delivery\DirectDeliveryCore.cs" /> <Compile Include="Delivery\Formatters\MessageDeliveryConverter.cs" /> <Compile Include="Delivery\Formatters\MessageDeliveryFormatter.cs" /> + <Compile Include="GlobalSuppressions.cs" /> <Compile Include="MessageDeliveryContext.cs" /> <Compile Include="AutoSubscribeBehavior.cs" /> <Compile Include="Threading\CountdownLatch.cs" /> IServiceOriented.ServiceBus/IServiceOriented.ServiceBus.csproj @@ -15,6 +15,7 @@ namespace IServiceOriented.ServiceBus public ListenerEndpoint(string name, string configurationName, string address, Type contractType, Listener listener) : base(Guid.NewGuid(), name, configurationName, address, contractType) { + Listener = listener; } public ListenerEndpoint(Guid id, string name, string configurationName, string address, Type contractType, Listener listener) : base(id, name, configurationName, address, contractType) IServiceOriented.ServiceBus/ListenerEndpoint.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Text; +using System.Globalization; namespace IServiceOriented.ServiceBus { @@ -26,7 +27,7 @@ namespace IServiceOriented.ServiceBus } if (item.Id == endpoint.Id) { - throw new DuplicateIdentifierException(String.Format("The id {0} is associated with another endpoint.", endpoint.Id)); + throw new DuplicateIdentifierException(String.Format(CultureInfo.InvariantCulture, "The id {0} is associated with another endpoint.", endpoint.Id)); } } } @@ -60,12 +61,13 @@ namespace IServiceOriented.ServiceBus /// Gets the listener with the specified ID. /// </summary> /// <param name="value">ID of the listener to get</param> - public ListenerEndpoint this[Guid value] + public ListenerEndpoint Find(Guid value) { - get - { - return _fastLookup[value]; - } + ListenerEndpoint endpoint; + + _fastLookup.TryGetValue(value, out endpoint); + + return endpoint; } } } IServiceOriented.ServiceBus/ListenerEndpointCollection.cs @@ -32,7 +32,7 @@ namespace IServiceOriented.ServiceBus.Listeners /// Gets the type that should be hosted by the ServiceHost /// </summary> /// <returns></returns> - protected virtual Type GetServiceImplementationType() + protected virtual Type CreateServiceImplementationType() { Type hostType = WcfServiceHostFactory.CreateImplementationType(Endpoint.ContractType); return hostType; @@ -44,7 +44,7 @@ namespace IServiceOriented.ServiceBus.Listeners /// <returns></returns> protected virtual ServiceHost CreateServiceHost() { - return WcfServiceHostFactory.CreateHost(Runtime, Endpoint.ContractType, GetServiceImplementationType(), Endpoint.ConfigurationName, Endpoint.Address); + return WcfServiceHostFactory.CreateHost(Runtime, Endpoint.ContractType, CreateServiceImplementationType(), Endpoint.ConfigurationName, Endpoint.Address); } IServiceOriented.ServiceBus/Listeners/WcfListener.cs @@ -232,15 +232,16 @@ namespace IServiceOriented.ServiceBus.Listeners /// </summary> public class WcfListenerServiceHost : ServiceHost { - public WcfListenerServiceHost(object host, string contract, string configurationName, string address) - : base(host) + public WcfListenerServiceHost(object host, string contract, string configurationName, string address) : base(host) { ConfigurationName = configurationName; + ContractName = contract; + Address = address; - LoadConfigurationSection(GetConfiguration(configurationName, contract, address)); + LoadConfigurationSection(GetConfiguration(ConfigurationName, ContractName, Address)); } - protected ServiceElement FindServiceElementInConfig(string name) + protected static ServiceElement FindServiceElementInConfig(string name) { Configuration appConfig = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None); ServiceModelSectionGroup serviceModel = ServiceModelSectionGroup.GetSectionGroup(appConfig); @@ -248,7 +249,7 @@ namespace IServiceOriented.ServiceBus.Listeners ServiceElement serviceElement = null; foreach (ServiceElement e in serviceModel.Services.Services) { - if (e.Name == ConfigurationName) + if (e.Name == name) { serviceElement = e; break; @@ -257,7 +258,7 @@ namespace IServiceOriented.ServiceBus.Listeners return serviceElement; } - protected virtual ServiceElement GetConfiguration(string configurationName, string contract, string address) + protected static ServiceElement GetConfiguration(string configurationName, string contract, string address) { // Use standard WCF configuration elements as a template, find the <service> element with a matching name and replace the contract and address with actual values @@ -282,9 +283,21 @@ namespace IServiceOriented.ServiceBus.Listeners private set; } - protected override void ApplyConfiguration() + public string ContractName + { + get; + private set; + } + + public string Address { + get; + private set; + } + protected override void ApplyConfiguration() + { + } } } IServiceOriented.ServiceBus/Listeners/WcfServiceHostFactory.cs @@ -24,25 +24,25 @@ namespace IServiceOriented.ServiceBus { public MessageDelivery(Guid subscriptionEndpointId, Type contractType, string action, object message, int maxRetries, MessageDeliveryContext context) { - _messageId = Guid.NewGuid().ToString(); - _subscriptionEndpointId = subscriptionEndpointId; - _action = action; - _message = message; - _maxRetries = maxRetries; - _context = context; + MessageId = Guid.NewGuid().ToString(); + SubscriptionEndpointId = subscriptionEndpointId; + Action = action; + Message = message; + MaxRetries = maxRetries; + Context = context; ContractType = contractType; } public MessageDelivery(string messageId, Guid subscriptionEndpointId, Type contractType, string action, object message, int maxRetries, int retryCount, DateTime? timeToProcess, MessageDeliveryContext context) { - _messageId = messageId; - _subscriptionEndpointId = subscriptionEndpointId; - _action = action; - _message = message; - _retryCount = retryCount; - _timeToProcess = timeToProcess; - _maxRetries = maxRetries; - _context = context; + MessageId = messageId; + SubscriptionEndpointId = subscriptionEndpointId; + Action = action; + Message = message; + RetryCount = retryCount; + TimeToProcess = timeToProcess; + MaxRetries = maxRetries; + Context = context; ContractType = contractType; } IServiceOriented.ServiceBus/MessageDelivery.cs @@ -8,8 +8,9 @@ using System.Runtime.Serialization; namespace IServiceOriented.ServiceBus { - [CollectionDataContract] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix"), CollectionDataContract] [KnownType("GetKnownTypes")] + [Serializable] public class MessageDeliveryContext : IReadOnlyDictionary<string,object> { public MessageDeliveryContext() @@ -32,7 +33,7 @@ namespace IServiceOriented.ServiceBus } } - public MessageDeliveryContext(IEnumerable<KeyValuePair<string, object>> pairs) + public MessageDeliveryContext(KeyValuePair<string, object>[] pairs) { foreach (KeyValuePair<string, object> pair in pairs) { IServiceOriented.ServiceBus/MessageDeliveryContext.cs @@ -361,20 +361,17 @@ namespace IServiceOriented.ServiceBus } } - public void Publish(Type contractType, string action, object message) + public MessageDelivery[] Publish(Type contractType, string action, object message) { - MessageDelivery[] results; - Publish(new PublishRequest(contractType, action, message, new MessageDeliveryContext()), PublishWait.None, TimeSpan.MinValue, out results); + return Publish(new PublishRequest(contractType, action, message, new MessageDeliveryContext()), PublishWait.None, TimeSpan.MinValue); } - public void Publish(PublishRequest publishRequest) + public MessageDelivery[] Publish(PublishRequest publishRequest) { - MessageDelivery[] results; - Publish(publishRequest, PublishWait.None, TimeSpan.MinValue, out results); + return Publish(publishRequest, PublishWait.None, TimeSpan.MinValue); } - - public void Publish(PublishRequest publishRequest, PublishWait wait, TimeSpan timeout, out MessageDelivery[] res) + public MessageDelivery[] Publish(PublishRequest publishRequest, PublishWait wait, TimeSpan timeout) { DeliveryCore deliveryCore = ServiceLocator.GetInstance<DeliveryCore>(); @@ -386,12 +383,8 @@ namespace IServiceOriented.ServiceBus bool waitForReply = wait != PublishWait.None; - res = null; - MessageDelivery[] results = null; - int subscriptionCount = subscriptions.Count(); - List<MessageDelivery> messageDeliveries = new List<MessageDelivery>(); CorrelationMessageFilter filter; ActionDispatcher dispatcher; @@ -466,7 +459,7 @@ namespace IServiceOriented.ServiceBus foreach (MessageDelivery md in messageDeliveries) { - deliveryCore.Deliver(md); + deliveryCore.Deliver(md); } ts.Complete(); @@ -489,8 +482,7 @@ namespace IServiceOriented.ServiceBus } } - - res = results; + return results; } public Collection<ListenerEndpoint> ListListeners() @@ -674,7 +666,7 @@ namespace IServiceOriented.ServiceBus } var failed = _messageDeliveryFailed; - if (failed != null) failed(this, new MessageDeliveryFailedEventArgs() { MessageDelivery = delivery, Permanent = false }); + if (failed != null) failed(this, new MessageDeliveryFailedEventArgs() { MessageDelivery = delivery, Permanent = permanent }); } object _eventLock = new Object(); IServiceOriented.ServiceBus/ServiceBusRuntime.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Text; +using System.Globalization; namespace IServiceOriented.ServiceBus { @@ -26,7 +27,7 @@ namespace IServiceOriented.ServiceBus } if (item.Id == endpoint.Id) { - throw new DuplicateIdentifierException(String.Format("The id {0} is associated with another endpoint.", endpoint.Id)); + throw new DuplicateIdentifierException(String.Format(CultureInfo.InvariantCulture, "The id {0} is associated with another endpoint.", endpoint.Id)); } } } @@ -60,12 +61,11 @@ namespace IServiceOriented.ServiceBus /// Gets the subscription with the specified ID. /// </summary> /// <param name="value">ID of the subscription to get</param> - public SubscriptionEndpoint this[Guid value] + public SubscriptionEndpoint Find(Guid value) { - get - { - return _fastLookup[value]; - } + SubscriptionEndpoint endpoint = null; + _fastLookup.TryGetValue(value, out endpoint); + return endpoint; } } } IServiceOriented.ServiceBus/SubscriptionEndpointCollection.cs 335a74954f343ef684e470a4efbe16431174d757 jezell jezell@gmail.com http://github.com/jezell/iserviceoriented/commit/d8830853c591c7d999ce035bf54826adefe4663e d8830853c591c7d999ce035bf54826adefe4663e

2008-10-11T16:35:10-07:00

FXCop cleanup, warning as errors enabled, code analysis enabled f395c4ef4214d65ecf2db1b4d627f8a4d616d82f jezell jezell@gmail.com