Changeset 948

Timestamp:

12/10/08 15:03:00 (16 years ago)

Author:

svonolfe

Message:

Refactored DAL (#372)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/HeuristicLab.Hive.Contracts.csproj (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/ILifecycleManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/ITransactionManager.cs (added)
• HeuristicLab.Hive.Server.ADODataAccess/ClientAdapter.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/TransactionManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.ADODataAccess/UserAdapter.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/UserGroupAdapter.cs (modified) (6 diffs)
• HeuristicLab.Hive.Server.Core/HeuristicLab.Hive.Server.Core.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/InternalInterfaces/DataAccess/ITransactionManager.cs (deleted)
• HeuristicLab.Hive.Server.Core/LifecycleManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/ServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server/HiveServerApplication.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Contracts/HeuristicLab.Hive.Contracts.csproj

@@ -89 +89 @@
     <Compile Include="Interfaces\ILifecycleManager.cs" />
     <Compile Include="Interfaces\IServerConsoleFacade.cs" />
+    <Compile Include="Interfaces\ITransactionManager.cs" />
     <Compile Include="Interfaces\IUserRoleManager.cs" />
     <Compile Include="JobBase.cs" />

trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/ILifecycleManager.cs

@@ -36 +36 @@
 
     /// <summary>
+    /// Gets the transaction manager
+    /// </summary>
+    /// <returns></returns>
+    ITransactionManager GetTransactionManager();
+
+    /// <summary>
     /// Shuts the application down
     /// </summary>
-    void Shtudown();
+    void Shutdown();
   }
 }

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/ClientAdapter.cs

@@ -37 +37 @@
       new dsHiveServer.ClientDataTable();
 
-    private IResourceAdapter resAdapter =
-      ServiceLocator.GetResourceAdapter();
+    private IResourceAdapter resAdapter = null;
+
+    private IResourceAdapter ResAdapter {
+      get {
+        if (resAdapter == null)
+          resAdapter = ServiceLocator.GetResourceAdapter();
+
+        return resAdapter;
+      }
+    }
 
     public ClientAdapter() {
@@ -53 +61 @@
         /*Parent - resource*/
         client.ResourceId = row.ResourceId;
-        resAdapter.GetResourceById(client);
+        ResAdapter.GetResourceById(client);
 
         /*ClientInfo*/
@@ -115 +123 @@
     public void UpdateClient(ClientInfo client) {
       if (client != null) {
-        resAdapter.UpdateResource(client);
+        ResAdapter.UpdateResource(client);
 
         dsHiveServer.ClientRow row = 
@@ -179 +187 @@
           data.RemoveClientRow(row);
 
-          return resAdapter.DeleteResource(client);
+          return ResAdapter.DeleteResource(client);
         }
       }

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/TransactionManager.cs

@@ -26 +26 @@
 using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
 using System.Timers;
+using HeuristicLab.Hive.Contracts.Interfaces;
 
 namespace HeuristicLab.Hive.Server.ADODataAccess {

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/UserAdapter.cs

@@ -37 +37 @@
         new dsHiveServer.HiveUserDataTable();
 
-    private IPermissionOwnerAdapter permOwnerAdapter =
-       ServiceLocator.GetPermissionOwnerAdapter();
+    private IPermissionOwnerAdapter permOwnerAdapter = null;
+
+    private IPermissionOwnerAdapter PermOwnerAdapter {
+      get {
+        if (permOwnerAdapter == null)
+          permOwnerAdapter = ServiceLocator.GetPermissionOwnerAdapter();
+
+        return permOwnerAdapter;
+      }
+    }
 
     private IUserGroupAdapter userGroupAdapter = null;
+
+    private IUserGroupAdapter UserGroupAdapter {
+      get {
+        if(userGroupAdapter == null) {
+          userGroupAdapter = ServiceLocator.GetUserGroupAdapter();
+        }
+
+        return userGroupAdapter;
+      }
+    }
 
     public UserAdapter() {
@@ -55 +73 @@
         /*Parent - PermissionOwner*/
         user.PermissionOwnerId = row.PermissionOwnerId;
-        permOwnerAdapter.GetPermissionOwnerById(user);
+        PermOwnerAdapter.GetPermissionOwnerById(user);
 
         /*User*/
@@ -83 +101 @@
     public void UpdateUser(User user) {
       if (user != null) {
-        permOwnerAdapter.UpdatePermissionOwner(user);
+        PermOwnerAdapter.UpdatePermissionOwner(user);
 
         dsHiveServer.HiveUserRow row = 
@@ -116 +134 @@
 
       PermissionOwner permOwner =
-        permOwnerAdapter.GetPermissionOwnerByName(name);
+        PermOwnerAdapter.GetPermissionOwnerByName(name);
 
       if (permOwner != null) {
@@ -152 +170 @@
 
         if (row != null) {
-          if (userGroupAdapter == null)
-            userGroupAdapter =
-              ServiceLocator.GetUserGroupAdapter();
-
           ICollection<UserGroup> userGroups =
-            userGroupAdapter.MemberOf(user);
+            UserGroupAdapter.MemberOf(user);
 
           foreach (UserGroup group in userGroups) {
             group.Members.Remove(user);
-            userGroupAdapter.UpdateUserGroup(group);
+            UserGroupAdapter.UpdateUserGroup(group);
           }
 
           data.RemoveHiveUserRow(row);
 
-          return permOwnerAdapter.DeletePermissionOwner(user);
+          return PermOwnerAdapter.DeletePermissionOwner(user);
         }
       }

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/UserGroupAdapter.cs

@@ -44 +44 @@
       new dsHiveServer.PermissionOwner_UserGroupDataTable();
 
-    private IPermissionOwnerAdapter permOwnerAdapter =
-      ServiceLocator.GetPermissionOwnerAdapter();
-
-    private IUserAdapter userAdapter =
-      ServiceLocator.GetUserAdapter();
+    private IPermissionOwnerAdapter permOwnerAdapter = null;
+
+    private IPermissionOwnerAdapter PermOwnerAdapter {
+      get {
+        if (permOwnerAdapter == null)
+          permOwnerAdapter = ServiceLocator.GetPermissionOwnerAdapter();
+
+        return permOwnerAdapter;
+      }
+    }
+
+    private IUserAdapter userAdapter = null;
+
+    private IUserAdapter UserAdapter {
+      get {
+        if (userAdapter == null)
+          userAdapter = ServiceLocator.GetUserAdapter();
+
+        return userAdapter;
+      }
+    }
 
     public UserGroupAdapter() {
@@ -65 +81 @@
         /*Parent - Permission Owner*/
         userGroup.PermissionOwnerId = row.PermissionOwnerId;
-        permOwnerAdapter.GetPermissionOwnerById(userGroup);
+        PermOwnerAdapter.GetPermissionOwnerById(userGroup);
 
         //first check for created references
@@ -88 +104 @@
           if (permOwner == null) {
             PermissionOwner permissionOwner = 
-              userAdapter.GetUserById(permOwnerUserGroupRow.PermissionOwnerId);
+              UserAdapter.GetUserById(permOwnerUserGroupRow.PermissionOwnerId);
 
             if (permissionOwner == null) {
@@ -133 +149 @@
           //first update the member to make sure it exists in the DB
           if (permOwner is User) {
-            userAdapter.UpdateUser(permOwner as User);
+            UserAdapter.UpdateUser(permOwner as User);
           } else if (permOwner is UserGroup) {
             UpdateUserGroup(permOwner as UserGroup);
@@ -201 +217 @@
     public void UpdateUserGroup(UserGroup group) {
       if (group != null) {
-        permOwnerAdapter.UpdatePermissionOwner(group);
+        PermOwnerAdapter.UpdatePermissionOwner(group);
 
         dsHiveServer.UserGroupRow row =
@@ -292 +308 @@
           
           data.RemoveUserGroupRow(row);
-          return permOwnerAdapter.DeletePermissionOwner(group);
+          return PermOwnerAdapter.DeletePermissionOwner(group);
         }
       }

trunk/sources/HeuristicLab.Hive.Server.Core/HeuristicLab.Hive.Server.Core.csproj

@@ -75 +75 @@
     <Compile Include="InternalInterfaces\DataAccess\IPermissionOwnerAdapter.cs" />
     <Compile Include="InternalInterfaces\DataAccess\IResourceAdapter.cs" />
-    <Compile Include="InternalInterfaces\DataAccess\ITransactionManager.cs" />
     <Compile Include="InternalInterfaces\DataAccess\IUserAdapter.cs" />
     <Compile Include="InternalInterfaces\DataAccess\IUserGroupAdapter.cs" />

trunk/sources/HeuristicLab.Hive.Server.Core/LifecycleManager.cs

@@ -25 +25 @@
 using System.Text;
 using HeuristicLab.Hive.Contracts.Interfaces;
+using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -34 +35 @@
     }
 
-    public void Shtudown() {
+    public ITransactionManager GetTransactionManager() {
+      return ServiceLocator.GetTransactionManager();
+    }
+
+    public void Shutdown() {
       ServiceLocator.GetTransactionManager().UpdateDB();
     }

trunk/sources/HeuristicLab.Hive.Server.Core/ServiceLocator.cs

@@ -23 +23 @@
 using HeuristicLab.PluginInfrastructure;
 using System.Runtime.CompilerServices;
+using HeuristicLab.Hive.Contracts.Interfaces;
 
 /// <summary>

trunk/sources/HeuristicLab.Hive.Server/HiveServerApplication.cs

@@ -147 +147 @@
 
         lifecycleManager.Init();
+        //sync with db every 5 minutes
+        lifecycleManager.GetTransactionManager().EnableAutoUpdate(
+          new TimeSpan(0, 5, 0));
 
         Form mainForm = new MainForm(clientCommunicator.BaseAddresses[0],
@@ -153 +156 @@
          Application.Run(mainForm);
 
-         lifecycleManager.Shtudown();
+         lifecycleManager.Shutdown();
       }