Changeset 1597 for trunk/sources

Timestamp:

04/17/09 14:03:06 (16 years ago)

Author:

svonolfe

Message:

Refactored ResourceAdapter (polymorphic implementation) (#372)

Location:

trunk/sources

Files:

• HeuristicLab.DataAccess/3.2/HeuristicLab.DataAccess-3.2.csproj (modified) (1 diff)
• HeuristicLab.DataAccess/3.2/Interfaces/IPolymorphicDataAdapter.cs (added)
• HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientGroupAdapter.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/3.2/ResourceAdapter.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.DataAccess/3.2/IResourceAdapter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DataAccess/3.2/HeuristicLab.DataAccess-3.2.csproj

@@ -95 +95 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Interfaces\IPolymorphicDataAdapter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DataAccessPlugin.cs" />

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientGroupAdapter.cs

@@ -71 +71 @@
       }
     }
-
-    private IClientAdapter clientAdapter = null;
-
-    private IClientAdapter ClientAdapter {
-      get {
-        if (clientAdapter == null)
-          clientAdapter =
-            this.Session.GetDataAdapter<ClientInfo, IClientAdapter>();
-
-        return clientAdapter;
-      }
-    }
     #endregion
 
@@ -102 +90 @@
        clientGroup.Resources.Clear();
         foreach(Guid resource in resources) {
-          ClientInfo client = 
-            ClientAdapter.GetById(resource);
+          Resource res =
+            ResAdapter.GetByIdPolymorphic(resource);
 
-          if (client == null) {
-            //client group
-            ClientGroup group =
-              GetById(resource);
-
-            clientGroup.Resources.Add(group);
-          } else {
-            clientGroup.Resources.Add(client);
-          }          
+            clientGroup.Resources.Add(res);         
         }
 
@@ -141 +121 @@
           new List<Guid>();
         foreach(Resource res in group.Resources) {
-          if (res is ClientInfo) {
-            ClientAdapter.Update(res as ClientInfo);
-          } else if (res is ClientGroup) {
-            Update(res as ClientGroup);
-          } else {
-            ResAdapter.Update(res);
-          }
+          ResAdapter.UpdatePolymorphic(res);
 
           relationships.Add(res.Id);

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ResourceAdapter.cs

@@ -49 +49 @@
         
         return clientAdapter;
+      }
+    }
+
+    private IClientGroupAdapter clientGroupAdapter = null;
+
+    private IClientGroupAdapter ClientGroupAdapter {
+      get {
+        if (clientGroupAdapter == null)
+          clientGroupAdapter =
+            this.Session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();
+
+        return clientGroupAdapter;
       }
     }
@@ -108 +120 @@
 
     #endregion
+
+    #region IPolymorphicDataAdapter<Resource> Members
+
+    public void UpdatePolymorphic(Resource res) {
+      if (res is ClientInfo) {
+        ClientAdapter.Update(res as ClientInfo);
+      } else if (res is ClientGroup) {
+        ClientGroupAdapter.Update(res as ClientGroup);
+      } else {
+        this.Update(res);
+      }
+    }
+
+    public Resource GetByIdPolymorphic(Guid id) {
+      ClientGroup group =
+        ClientGroupAdapter.GetById(id);
+
+      if (group != null)
+        return group;
+      else {
+        ClientInfo client =
+          ClientAdapter.GetById(id);
+
+        if (client != null)
+          return client;
+        else {
+          return this.GetById(id);
+        }
+      }
+    }
+
+    public bool DeletePolymorphic(Resource res) {
+      if (res is ClientInfo) {
+        return ClientAdapter.Delete(res as ClientInfo);
+      } else if (res is ClientGroup) {
+        return ClientGroupAdapter.Delete(res as ClientGroup);
+      } else {
+        return this.Delete(res);
+      }
+    }
+
+    #endregion
   }
 }

trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IResourceAdapter.cs

@@ -30 +30 @@
   /// The resource database adapter
   /// </summary>
-  public interface IResourceAdapter: IDataAdapter<Resource> {
+  public interface IResourceAdapter: IPolymorphicDataAdapter<Resource> {
     /// <summary>
     /// Gets the resource and updates the values of the object