Merge pull request #4429 from sbwalker/dev

remove hardcoded names when using GetInterface()
oqtane · Jul 17, 2024 · 3c435a8 · 3c435a8
2 parents 98adc2e + 7ee6775
commit 3c435a8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
@@ -194,7 +194,7 @@ public void Delete(int id, int siteid)
  {
  try
  {
- if (moduletype.GetInterface("IInstallable") != null)
+ if (moduletype.GetInterface(nameof(IInstallable)) != null)
  {
  _tenantManager.SetTenant(tenant.TenantId);
  var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);

diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -452,7 +452,7 @@ private Installation MigrateModules(InstallConfig install)
  {
  try
  {
- if (moduleType.GetInterface("IInstallable") != null)
+ if (moduleType.GetInterface(nameof(IInstallable)) != null)
  {
  tenantManager.SetTenant(tenant.TenantId);
  var moduleObject = ActivatorUtilities.CreateInstance(scope.ServiceProvider, moduleType) as IInstallable;

diff --git a/Oqtane.Server/Pages/Sitemap.cshtml.cs b/Oqtane.Server/Pages/Sitemap.cshtml.cs
@@ -73,7 +73,7 @@ public IActionResult OnGet()
  if (moduleDefinition != null && moduleDefinition.ServerManagerType != "")
  {
  Type moduletype = Type.GetType(moduleDefinition.ServerManagerType);
- if (moduletype != null && moduletype.GetInterface("ISitemap") != null)
+ if (moduletype != null && moduletype.GetInterface(nameof(ISitemap)) != null)
  {
  try
  {

diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -340,7 +340,7 @@ private List<ModuleDefinition> LoadModuleDefinitionsFromAssembly(List<ModuleDefi
  if (!string.IsNullOrEmpty(moduledefinition.ServerManagerType))
  {
  Type servertype = Type.GetType(moduledefinition.ServerManagerType);
- if (servertype != null && servertype.GetInterface("IPortable") != null)
+ if (servertype != null && servertype.GetInterface(nameof(IPortable)) != null)
  {
  moduledefinition.IsPortable = true;
  }

diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs
@@ -107,7 +107,7 @@ public string ExportModule(int moduleId)
  if (moduledefinition.ServerManagerType != "")
  {
  Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
- if (moduletype != null && moduletype.GetInterface("IPortable") != null)
+ if (moduletype != null && moduletype.GetInterface(nameof(IPortable)) != null)
  {
  try
  {
@@ -152,7 +152,7 @@ public bool ImportModule(int moduleId, string content)
  if (moduledefinition.ServerManagerType != "")
  {
  Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
- if (moduletype != null && moduletype.GetInterface("IPortable") != null)
+ if (moduletype != null && moduletype.GetInterface(nameof(IPortable)) != null)
  {
  try
  {

diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
@@ -542,7 +542,7 @@ public void CreatePages(Site site, List<PageTemplate> pageTemplates, Alias alias
  if (pageTemplateModule.Content != "" && moduleDefinition.ServerManagerType != "")
  {
  Type moduletype = Type.GetType(moduleDefinition.ServerManagerType);
- if (moduletype != null && moduletype.GetInterface("IPortable") != null)
+ if (moduletype != null && moduletype.GetInterface(nameof(IPortable)) != null)
  {
  try
  {