Refactor interface name

nsacyber · Apr 12, 2024 · c1f63c7 · c1f63c7
1 parent d0deb49
commit c1f63c7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/...areManifestPlugin/src/HardwareManifest.cs → ...ifestPlugin/src/HardwareManifestPlugin.cs b/...areManifestPlugin/src/HardwareManifest.cs → ...ifestPlugin/src/HardwareManifestPlugin.cs
@@ -1,7 +1,7 @@
 using HardwareManifestProto;
 
 namespace HardwareManifestPlugin {
-    public abstract class HardwareManifest : IHardwareManifest {
+    public abstract class HardwareManifestPlugin : IHardwareManifestPlugin {
         public string Name {
             get;
             protected set;

diff --git a/...reManifestPlugin/src/IHardwareManifest.cs → ...festPlugin/src/IHardwareManifestPlugin.cs b/...reManifestPlugin/src/IHardwareManifest.cs → ...festPlugin/src/IHardwareManifestPlugin.cs
@@ -1,7 +1,7 @@
 using HardwareManifestProto;
 
 namespace HardwareManifestPlugin {
-    public interface IHardwareManifest {
+    public interface IHardwareManifestPlugin {
         string Name {
             get;
         }

diff --git a/...areManifestPlugin/HardwareManifestPluginManager/src/HardwareManifestPluginManagerUtils.cs b/...areManifestPlugin/HardwareManifestPluginManager/src/HardwareManifestPluginManagerUtils.cs
@@ -12,13 +12,13 @@ public class HardwareManifestPluginManagerUtils {
         public static readonly string TrustPath = Path.Combine(Path.GetDirectoryName(Environment.ProcessPath), "trust");
 #pragma warning restore CS8604 // Possible null reference argument.
 
-        public static List<IHardwareManifest> LoadPlugins(List<string> names, bool sbomExpected) {
+        public static List<IHardwareManifestPlugin> LoadPlugins(List<string> names, bool sbomExpected) {
             string[] pluginDlls = System.IO.Directory.GetFiles(PluginsPath, "*.dll");
-            List<IHardwareManifest> manifests = new();
+            List<IHardwareManifestPlugin> manifests = new();
             List<Tuple<string, string>> namesWithArgs = new();
             foreach(string dllPath in pluginDlls) {
                 Assembly pluginAssembly = LoadAssemblyFromDll(dllPath);
-                IHardwareManifest? manifest = GatherManifestIfNameSelected(pluginAssembly, names);
+                IHardwareManifestPlugin? manifest = GatherManifestIfNameSelected(pluginAssembly, names);
                 if (manifest != null) {
                     bool trustManifest = !sbomExpected;
                     if (sbomExpected) {
@@ -44,10 +44,10 @@ private static Assembly LoadAssemblyFromDll(string relativePath) {
             return loadContext.LoadFromAssemblyName(new AssemblyName(Path.GetFileNameWithoutExtension(fullPath)));
         }
 
-        private static IHardwareManifest? GatherManifestIfNameSelected(Assembly assembly, List<string> names) {
+        private static IHardwareManifestPlugin? GatherManifestIfNameSelected(Assembly assembly, List<string> names) {
             foreach (Type type in assembly.GetTypes()) {
-                if (typeof(IHardwareManifest).IsAssignableFrom(type)) {
-                    if (Activator.CreateInstance(type) is IHardwareManifest result && names.Remove(result.Name)) {
+                if (typeof(IHardwareManifestPlugin).IsAssignableFrom(type)) {
+                    if (Activator.CreateInstance(type) is IHardwareManifestPlugin result && names.Remove(result.Name)) {
                         Log.Debug("Found " + result.Name + ".");
                         return result;
                     }