Changeset 4263 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades

Timestamp:

08/19/10 12:41:05 (14 years ago)

Author:

cneumuel

Message:

consolidated Response objects to use only StatusMessage with enums instead of strings.
removed Success property from Response. success is now represented by StatusMessage alone. (#1159)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades

Files:

• ExecutionEngineFacade.cs (modified) (3 diffs)
• ServerConsoleFacade.cs (modified) (4 diffs)
• SlaveFacade.cs (modified) (6 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs

@@ -28 +28 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Server.DataAccess;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -60 +61 @@
     public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
       using (contextFactory.GetContext(false)) {
-        return jobManager.GetLastSerializedJobResultOf(jobId, requested, snapshot);
+        return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
       }
     }
@@ -77 +78 @@
 
 
-    public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
+    public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
       using (contextFactory.GetContext(false)) {
-        return jobManager.GetAllJobResults(jobIds);
+        return jobManager.GetJobResults(jobIds);
       }
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -31 +31 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Server.DataAccess;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 
@@ -53 +54 @@
       sessionID = secMan.Login(username, password);
       if (sessionID == Guid.Empty) {
-        resp.Success = false;
-        resp.StatusMessage = ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_FAILED;
-      } else {
-        resp.Success = true;
-        resp.StatusMessage =
-          ApplicationConstants.RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS;
+        resp.StatusMessage = ResponseStatus.Login_LoginFaild;
       }
       return resp;
@@ -64 +60 @@
 
 
-    public ResponseList<ClientDto> GetAllClients() {
+    public ResponseList<ClientDto> GetAllSlaves() {
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessClients", sessionID, Guid.Empty);
-        return slaveManager.GetAllClients();
+        return slaveManager.GetAllSlaves();
       }
     }
@@ -140 +136 @@
     }
 
-    public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
+    //public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
+    //  using (contextFactory.GetContext(false)) {
+    //    secMan.Authorize("AccessJobResults", sessionID, jobId);
+    //    return jobManager.GetLastJobResultOf(jobId);
+    //  }
+    //}
+
+    public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId, bool requested, bool snapshot) {
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessJobResults", sessionID, jobId);
-        return jobManager.GetLastJobResultOf(jobId);
-      }
-    }
-
-    public ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot) {
-      using (contextFactory.GetContext(false)) {
-        secMan.Authorize("AccessJobResults", sessionID, jobId);
-        return jobManager.GetLastSerializedJobResultOf(jobId, requested, snapshot);
-      }
-    }
-
-    public ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds) {
+        return jobManager.GetLastSerializedResult(jobId, requested, snapshot);
+      }
+    }
+
+    public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
       using (contextFactory.GetContext(false)) {
         //secMan.Authorize("AccessJobResults", sessionID, jobId); skip authorization
-        return jobManager.GetAllJobResults(jobIds);
-      }
-    }
-
-    public Response RemoveJob(Guid jobId) {
-      using (contextFactory.GetContext()) {
-        secMan.Authorize("RemoveJob", sessionID, jobId);
-        return jobManager.RemoveJob(jobId);
-      }
-    }
+        return jobManager.GetJobResults(jobIds);
+      }
+    }
+
+    //public Response RemoveJob(Guid jobId) {
+    //  using (contextFactory.GetContext()) {
+    //    secMan.Authorize("RemoveJob", sessionID, jobId);
+    //    return jobManager.RemoveJob(jobId);
+    //  }
+    //}
 
     public Response RequestSnapshot(Guid jobId) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs

@@ -35 +35 @@
 using HeuristicLab.Hive.Server.LINQDataAccess;
 using HeuristicLab.Hive.Server.DataAccess;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -85 +86 @@
     }
 
-    public ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList) {
-      return slaveCommunicator.SendPlugins(pluginList);      
+    public ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList) {
+      return slaveCommunicator.GetPlugins(pluginList);      
     }
 
@@ -94 +95 @@
       }
     }
-
 
     public ResponseCalendar GetCalendar(Guid clientId) {
@@ -114 +114 @@
     /// Do not use automatic transactions here
     /// </summary>
-    public Stream SendStreamedJob(Guid clientId) {
+    public Stream GetStreamedJob(Guid clientId) {
       using (contextFactory.GetContext(false)) {
         MultiStream stream = new MultiStream();
@@ -125 +125 @@
         stream.AddStream(new StreamedObject<ResponseObject<JobDto>>(job));
 
-        IJobManager jobManager = ServiceLocator.GetJobManager();
-        IInternalJobManager internalJobManager = (IInternalJobManager)jobManager;
+        IInternalJobManager internalJobManager = (IInternalJobManager)ServiceLocator.GetJobManager();
 
         //second stream the job binary data
         MemoryStream memoryStream = new MemoryStream();
-        if (job.Obj != null)
+        if (job.Obj != null) {
           stream.AddStream(new MemoryStream(internalJobManager.GetSerializedJobDataById(job.Obj.Id)));
+        }
 
         OperationContext clientContext = OperationContext.Current;
@@ -144 +144 @@
     }
 
-    public Stream SendStreamedPlugins(List<HivePluginInfoDto> pluginList) {
-      return new StreamedObject<ResponseList<CachedHivePluginInfoDto>>(this.SendPlugins(pluginList));
+    public Stream GetStreamedPlugins(List<HivePluginInfoDto> pluginList) {
+      return new StreamedObject<ResponseList<CachedHivePluginInfoDto>>(this.GetPlugins(pluginList));
     }