Skip to content
This repository was archived by the owner on Apr 29, 2022. It is now read-only.

Commit 515dd51

Browse files
antonyvorontsovantonyvorontsov
committed
Moved IDisposable interface, changed DI extension class (codestyle)
1 parent 815fc78 commit 515dd51

File tree

3 files changed

+36
-85
lines changed

3 files changed

+36
-85
lines changed

‎src/RabbitMQ.Client.Core.DependencyInjection/IQueueService.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
using System;
2-
using System.Threading.Tasks;
1+
using System.Threading.Tasks;
32

43
namespace RabbitMQ.Client.Core.DependencyInjection
54
{
65
/// <summary>
76
/// Custom RabbitMQ queue service interface.
87
/// </summary>
9-
public interface IQueueService : IDisposable
8+
public interface IQueueService
109
{
1110
/// <summary>
1211
/// RabbitMQ connection.

‎src/RabbitMQ.Client.Core.DependencyInjection/RabbitMQ.Client.Core.DependencyInjection.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<LangVersion>latest</LangVersion>
6-
<Version>1.3.0</Version>
6+
<Version>1.3.1</Version>
77
<PackageTags>RabbitMQ</PackageTags>
88
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
99
<RepositoryUrl>https://github.com/AntonyVorontsov/RabbitMQ.Client.Core.DependencyInjection</RepositoryUrl>

‎src/RabbitMQ.Client.Core.DependencyInjection/RabbitMqClientDependencyInjectionExtensions.cs‎

Lines changed: 33 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,8 @@ static void CheckExchangeExists(IServiceCollection services, string exchangeName
8181
/// <param name="services">Service collection.</param>
8282
/// <param name="routingKey">Routing key.</param>
8383
/// <returns>Service collection.</returns>
84-
public static IServiceCollection AddMessageHandlerTransient<T>(this IServiceCollection services, string routingKey)
85-
where T : class, IMessageHandler
86-
{
87-
return services.AddInstanceTransient<IMessageHandler, T>(new[] { routingKey }.ToList());
88-
}
84+
public static IServiceCollection AddMessageHandlerTransient<T>(this IServiceCollection services, string routingKey) where T : class, IMessageHandler =>
85+
services.AddInstanceTransient<IMessageHandler, T>(new[] { routingKey }.ToList());
8986

9087
/// <summary>
9188
/// Add transient message handler.
@@ -94,11 +91,8 @@ public static IServiceCollection AddMessageHandlerTransient<T>(this IServiceColl
9491
/// <param name="services">Service collection.</param>
9592
/// <param name="routingKeys">Routing keys.</param>
9693
/// <returns>Service collection.</returns>
97-
public static IServiceCollection AddMessageHandlerTransient<T>(this IServiceCollection services, IEnumerable<string> routingKeys)
98-
where T : class, IMessageHandler
99-
{
100-
return services.AddInstanceTransient<IMessageHandler, T>(routingKeys.ToList());
101-
}
94+
public static IServiceCollection AddMessageHandlerTransient<T>(this IServiceCollection services, IEnumerable<string> routingKeys) where T : class, IMessageHandler =>
95+
services.AddInstanceTransient<IMessageHandler, T>(routingKeys.ToList());
10296

10397
/// <summary>
10498
/// Add singleton message handler.
@@ -107,11 +101,8 @@ public static IServiceCollection AddMessageHandlerTransient<T>(this IServiceColl
107101
/// <param name="services">Service collection.</param>
108102
/// <param name="routingKey">Routing key.</param>
109103
/// <returns>Service collection.</returns>
110-
public static IServiceCollection AddMessageHandlerSingleton<T>(this IServiceCollection services, string routingKey)
111-
where T : class, IMessageHandler
112-
{
113-
return services.AddInstanceSingleton<IMessageHandler, T>(new[] { routingKey }.ToList());
114-
}
104+
public static IServiceCollection AddMessageHandlerSingleton<T>(this IServiceCollection services, string routingKey) where T : class, IMessageHandler =>
105+
services.AddInstanceSingleton<IMessageHandler, T>(new[] { routingKey }.ToList());
115106

116107
/// <summary>
117108
/// Add singleton message handler.
@@ -120,24 +111,18 @@ public static IServiceCollection AddMessageHandlerSingleton<T>(this IServiceColl
120111
/// <param name="services">Service collection.</param>
121112
/// <param name="routingKeys">Routing keys.</param>
122113
/// <returns>Service collection.</returns>
123-
public static IServiceCollection AddMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routingKeys)
124-
where T : class, IMessageHandler
125-
{
126-
return services.AddInstanceSingleton<IMessageHandler, T>(routingKeys.ToList());
127-
}
128-
114+
public static IServiceCollection AddMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routingKeys) where T : class, IMessageHandler =>
115+
services.AddInstanceSingleton<IMessageHandler, T>(routingKeys.ToList());
116+
129117
/// <summary>
130118
/// Add transient async message handler.
131119
/// </summary>
132120
/// <typeparam name="T">Message handler type.</typeparam>
133121
/// <param name="services">Service collection.</param>
134122
/// <param name="routingKey">Routing key.</param>
135123
/// <returns>Service collection.</returns>
136-
public static IServiceCollection AddAsyncMessageHandlerTransient<T>(this IServiceCollection services, string routingKey)
137-
where T : class, IAsyncMessageHandler
138-
{
139-
return services.AddInstanceTransient<IAsyncMessageHandler, T>(new[] { routingKey }.ToList());
140-
}
124+
public static IServiceCollection AddAsyncMessageHandlerTransient<T>(this IServiceCollection services, string routingKey) where T : class, IAsyncMessageHandler =>
125+
services.AddInstanceTransient<IAsyncMessageHandler, T>(new[] { routingKey }.ToList());
141126

142127
/// <summary>
143128
/// Add transient async message handler.
@@ -146,11 +131,8 @@ public static IServiceCollection AddAsyncMessageHandlerTransient<T>(this IServic
146131
/// <param name="services">Service collection.</param>
147132
/// <param name="routingKeys">Routing keys.</param>
148133
/// <returns>Service collection.</returns>
149-
public static IServiceCollection AddAsyncMessageHandlerTransient<T>(this IServiceCollection services, IEnumerable<string> routingKeys)
150-
where T : class, IAsyncMessageHandler
151-
{
152-
return services.AddInstanceTransient<IAsyncMessageHandler, T>(routingKeys.ToList());
153-
}
134+
public static IServiceCollection AddAsyncMessageHandlerTransient<T>(this IServiceCollection services, IEnumerable<string> routingKeys) where T : class, IAsyncMessageHandler =>
135+
services.AddInstanceTransient<IAsyncMessageHandler, T>(routingKeys.ToList());
154136

155137
/// <summary>
156138
/// Add singleton async message handler.
@@ -159,11 +141,8 @@ public static IServiceCollection AddAsyncMessageHandlerTransient<T>(this IServic
159141
/// <param name="services">Service collection.</param>
160142
/// <param name="routingKey">Routing key.</param>
161143
/// <returns>Service collection.</returns>
162-
public static IServiceCollection AddAsyncMessageHandlerSingleton<T>(this IServiceCollection services, string routingKey)
163-
where T : class, IAsyncMessageHandler
164-
{
165-
return services.AddInstanceSingleton<IAsyncMessageHandler, T>(new[] { routingKey }.ToList());
166-
}
144+
public static IServiceCollection AddAsyncMessageHandlerSingleton<T>(this IServiceCollection services, string routingKey) where T : class, IAsyncMessageHandler =>
145+
services.AddInstanceSingleton<IAsyncMessageHandler, T>(new[] { routingKey }.ToList());
167146

168147
/// <summary>
169148
/// Add singleton async message handler.
@@ -172,11 +151,8 @@ public static IServiceCollection AddAsyncMessageHandlerSingleton<T>(this IServic
172151
/// <param name="services">Service collection.</param>
173152
/// <param name="routingKeys">Routing keys.</param>
174153
/// <returns>Service collection.</returns>
175-
public static IServiceCollection AddAsyncMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routingKeys)
176-
where T : class, IAsyncMessageHandler
177-
{
178-
return services.AddInstanceSingleton<IAsyncMessageHandler, T>(routingKeys.ToList());
179-
}
154+
public static IServiceCollection AddAsyncMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routingKeys) where T : class, IAsyncMessageHandler =>
155+
services.AddInstanceSingleton<IAsyncMessageHandler, T>(routingKeys.ToList());
180156

181157
/// <summary>
182158
/// Add transient non-cyclic message handler.
@@ -185,11 +161,8 @@ public static IServiceCollection AddAsyncMessageHandlerSingleton<T>(this IServic
185161
/// <param name="services">Service collection.</param>
186162
/// <param name="routingKey">Routing key.</param>
187163
/// <returns>Service collection.</returns>
188-
public static IServiceCollection AddNonCyclicMessageHandlerTransient<T>(this IServiceCollection services, string routingKey)
189-
where T : class, INonCyclicMessageHandler
190-
{
191-
return services.AddInstanceTransient<INonCyclicMessageHandler, T>(new[] { routingKey }.ToList());
192-
}
164+
public static IServiceCollection AddNonCyclicMessageHandlerTransient<T>(this IServiceCollection services, string routingKey) where T : class, INonCyclicMessageHandler =>
165+
services.AddInstanceTransient<INonCyclicMessageHandler, T>(new[] { routingKey }.ToList());
193166

194167
/// <summary>
195168
/// Add transient non-cyclic message handler.
@@ -198,11 +171,8 @@ public static IServiceCollection AddNonCyclicMessageHandlerTransient<T>(this ISe
198171
/// <param name="services">Service collection.</param>
199172
/// <param name="routingKeys">Routing keys.</param>
200173
/// <returns>Service collection.</returns>
201-
public static IServiceCollection AddNonCyclicMessageHandlerTransient<T>(this IServiceCollection services, IEnumerable<string> routingKeys)
202-
where T : class, INonCyclicMessageHandler
203-
{
204-
return services.AddInstanceTransient<INonCyclicMessageHandler, T>(routingKeys.ToList());
205-
}
174+
public static IServiceCollection AddNonCyclicMessageHandlerTransient<T>(this IServiceCollection services, IEnumerable<string> routingKeys) where T : class, INonCyclicMessageHandler =>
175+
services.AddInstanceTransient<INonCyclicMessageHandler, T>(routingKeys.ToList());
206176

207177
/// <summary>
208178
/// Add singleton non-cyclic message handler.
@@ -211,11 +181,8 @@ public static IServiceCollection AddNonCyclicMessageHandlerTransient<T>(this ISe
211181
/// <param name="services">Service collection.</param>
212182
/// <param name="routingKey">Routing key.</param>
213183
/// <returns>Service collection.</returns>
214-
public static IServiceCollection AddNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, string routingKey)
215-
where T : class, INonCyclicMessageHandler
216-
{
217-
return services.AddInstanceSingleton<INonCyclicMessageHandler, T>(new[] { routingKey }.ToList());
218-
}
184+
public static IServiceCollection AddNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, string routingKey) where T : class, INonCyclicMessageHandler =>
185+
services.AddInstanceSingleton<INonCyclicMessageHandler, T>(new[] { routingKey }.ToList());
219186

220187
/// <summary>
221188
/// Add singleton non-cyclic message handler.
@@ -224,11 +191,8 @@ public static IServiceCollection AddNonCyclicMessageHandlerSingleton<T>(this ISe
224191
/// <param name="services">Service collection.</param>
225192
/// <param name="routingKeys">Routing keys.</param>
226193
/// <returns>Service collection.</returns>
227-
public static IServiceCollection AddNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routingKeys)
228-
where T : class, INonCyclicMessageHandler
229-
{
230-
return services.AddInstanceSingleton<INonCyclicMessageHandler, T>(routingKeys.ToList());
231-
}
194+
public static IServiceCollection AddNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routingKeys) where T : class, INonCyclicMessageHandler =>
195+
services.AddInstanceSingleton<INonCyclicMessageHandler, T>(routingKeys.ToList());
232196

233197
/// <summary>
234198
/// Add transient async non-cyclic message handler.
@@ -237,11 +201,8 @@ public static IServiceCollection AddNonCyclicMessageHandlerSingleton<T>(this ISe
237201
/// <param name="services">Service collection.</param>
238202
/// <param name="routingKey">Routing key.</param>
239203
/// <returns>Service collection.</returns>
240-
public static IServiceCollection AddAsyncNonCyclicMessageHandlerTransient<T>(this IServiceCollection services, string routingKey)
241-
where T : class, IAsyncNonCyclicMessageHandler
242-
{
243-
return services.AddInstanceTransient<IAsyncNonCyclicMessageHandler, T>(new[] { routingKey }.ToList());
244-
}
204+
public static IServiceCollection AddAsyncNonCyclicMessageHandlerTransient<T>(this IServiceCollection services, string routingKey) where T : class, IAsyncNonCyclicMessageHandler =>
205+
services.AddInstanceTransient<IAsyncNonCyclicMessageHandler, T>(new[] { routingKey }.ToList());
245206

246207
/// <summary>
247208
/// Add transient async non-cyclic message handler.
@@ -250,11 +211,8 @@ public static IServiceCollection AddAsyncNonCyclicMessageHandlerTransient<T>(thi
250211
/// <param name="services">Service collection.</param>
251212
/// <param name="routingKeys">Routing keys.</param>
252213
/// <returns>Service collection.</returns>
253-
public static IServiceCollection AddAsyncNonCyclicMessageHandlerTransient<T>(this IServiceCollection services, IEnumerable<string> routingKeys)
254-
where T : class, IAsyncNonCyclicMessageHandler
255-
{
256-
return services.AddInstanceTransient<IAsyncNonCyclicMessageHandler, T>(routingKeys.ToList());
257-
}
214+
public static IServiceCollection AddAsyncNonCyclicMessageHandlerTransient<T>(this IServiceCollection services, IEnumerable<string> routingKeys) where T : class, IAsyncNonCyclicMessageHandler =>
215+
services.AddInstanceTransient<IAsyncNonCyclicMessageHandler, T>(routingKeys.ToList());
258216

259217
/// <summary>
260218
/// Add singleton async non-cyclic message handler.
@@ -263,11 +221,8 @@ public static IServiceCollection AddAsyncNonCyclicMessageHandlerTransient<T>(thi
263221
/// <param name="services">Service collection.</param>
264222
/// <param name="routingKey">Routing key.</param>
265223
/// <returns>Service collection.</returns>
266-
public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, string routingKey)
267-
where T : class, IAsyncNonCyclicMessageHandler
268-
{
269-
return services.AddInstanceSingleton<IAsyncNonCyclicMessageHandler, T>(new[] { routingKey }.ToList());
270-
}
224+
public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, string routingKey) where T : class, IAsyncNonCyclicMessageHandler =>
225+
services.AddInstanceSingleton<IAsyncNonCyclicMessageHandler, T>(new[] { routingKey }.ToList());
271226

272227
/// <summary>
273228
/// Add singleton async non-cyclic message handler.
@@ -276,11 +231,8 @@ public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(thi
276231
/// <param name="services">Service collection.</param>
277232
/// <param name="routingKeys">Routing keys.</param>
278233
/// <returns>Service collection.</returns>
279-
public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routingKeys)
280-
where T : class, IAsyncNonCyclicMessageHandler
281-
{
282-
return services.AddInstanceSingleton<IAsyncNonCyclicMessageHandler, T>(routingKeys.ToList());
283-
}
234+
public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routingKeys) where T : class, IAsyncNonCyclicMessageHandler =>
235+
services.AddInstanceSingleton<IAsyncNonCyclicMessageHandler, T>(routingKeys.ToList());
284236

285237
static IServiceCollection AddInstanceTransient<U, T>(this IServiceCollection services, IEnumerable<string> routingKeys)
286238
where U : class

0 commit comments

Comments
 (0)