kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3954 from sbwalker/dev

Browse Source 
optimize to use ITransientService rather than introducing a new IServerService interface which needs to be scanned
This commit is contained in:
Shaun Walker 2024-03-05 10:59:57 -05:00 committed by GitHub
commit c346c4178d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
View File

@ -297,24 +297,6 @@ namespace Microsoft.Extensions.DependencyInjection
} }
} }
// dynamically register module server transient services (using conventions)
implementationTypes = assembly.GetInterfaces<IServerService>();
foreach (var implementationType in implementationTypes)
{
if (implementationType.AssemblyQualifiedName != null && implementationType.AssemblyQualifiedName.Contains("Services.Server"))
{
// module server services reference a common interface which is located in the client assembly
var serviceName = implementationType.AssemblyQualifiedName
// convert implementation type name to interface name and change Server assembly to Client
.Replace(".Services.Server", ".Services.I").Replace(".Server,", ".Client,");
var serviceType = Type.GetType(serviceName);
if (serviceType != null)
{
services.AddTransient(serviceType, implementationType);
}
}
}
// dynamically register module transient services (ie. server DBContext, repository classes) // dynamically register module transient services (ie. server DBContext, repository classes)
implementationTypes = assembly.GetInterfaces<ITransientService>(); implementationTypes = assembly.GetInterfaces<ITransientService>();
foreach (var implementationType in implementationTypes) foreach (var implementationType in implementationTypes)
@ -322,6 +304,14 @@ namespace Microsoft.Extensions.DependencyInjection
if (implementationType.AssemblyQualifiedName != null) if (implementationType.AssemblyQualifiedName != null)
{ {
var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}")); var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
if (serviceType == null && implementationType.AssemblyQualifiedName.Contains("Services.Server"))
{
// module server services reference a common interface which is located in the client assembly
var serviceName = implementationType.AssemblyQualifiedName
// convert implementation type name to interface name and change Server assembly to Client
.Replace(".Services.Server", ".Services.I").Replace(".Server,", ".Client,");
serviceType = Type.GetType(serviceName);
}
services.AddTransient(serviceType ?? implementationType, implementationType); services.AddTransient(serviceType ?? implementationType, implementationType);
} }
} }

2
Oqtane.Server/Modules/HtmlText/Services/HtmlTextService.cs
View File

@ -12,7 +12,7 @@ using Oqtane.Shared;
namespace Oqtane.Modules.HtmlText.Services namespace Oqtane.Modules.HtmlText.Services
{ {
[PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")] [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
public class ServerHtmlTextService : IHtmlTextService, IServerService public class ServerHtmlTextService : IHtmlTextService, ITransientService
{ {
private readonly IHtmlTextRepository _htmlText; private readonly IHtmlTextRepository _htmlText;
private readonly IUserPermissions _userPermissions; private readonly IUserPermissions _userPermissions;

9
Oqtane.Shared/Interfaces/IServerService.cs
View File

@ -1,9 +0,0 @@
namespace Oqtane.Modules
{
/// <summary>
/// Empty interface used to decorate server module services for auto registration as scoped
/// </summary>
public interface IServerService
{
}
}