Changeset 5526 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceLocator.cs

Timestamp:

02/21/11 17:35:42 (14 years ago)

Author:

cneumuel

Message:

#1233

• fixed handling of StateLog in DataLayer
• extended unit tests
• changed style of service calls to OKB-like style (using delegates)
• added possibility that parent jobs can be finished immediately when child jobs are finished

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceLocator.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceLocator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.ServiceModel;
 using HeuristicLab.Clients.Common;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
@@ -38 +40 @@
     }
 
-    public Disposable<IHiveService> GetService() {
-      return ClientFactory.CreateClient<IHiveService>("wsHttpBinding_IHiveService");
+    private string username;
+    public string Username {
+      get { return username; }
+      set { username = value; }
     }
 
-    public Disposable<IHiveService> GetService(string username, string password) {
-      return ClientFactory.CreateClient<IHiveService>("wsHttpBinding_IHiveService", null, username, password);
+    private string password;
+    public string Password {
+      get { return password; }
+      set { password = value; }
+    }
+    
+    public Disposable<ChannelFactory<IHiveService>> GetService() {
+      if (string.IsNullOrEmpty(username) && string.IsNullOrEmpty(password)) {
+        return ClientFactory.CreateChannelFactory<IHiveService>("wsHttpBinding_IHiveService");
+      } else {
+        return ClientFactory.CreateChannelFactory<IHiveService>("wsHttpBinding_IHiveService", null, username, password);
+      }
+    }
+
+    public void CallHiveService(Action<IHiveService> call) {
+      using (var channelFactory = this.GetService()) {
+        var service = channelFactory.Obj.CreateChannel();
+        call(service);
+      } // disposing the channelfactory is done by the disposable object; the channel gets disposed when the channelfactory is disposed
+    }
+
+    private T CallHiveService<T>(Func<IHiveService, T> call) {
+      using (var channelFactory = this.GetService()) {
+        var service = channelFactory.Obj.CreateChannel();
+        return call(service);
+      } // disposing the channelfactory is done by the disposable object; the channel gets disposed when the channelfactory is disposed
+    }
+
+    T IServiceLocator.CallHiveService<T>(Func<IHiveService, T> call) {
+      return CallHiveService<T>(call);
     }
   }