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

Timestamp:

08/18/10 17:23:09 (14 years ago)

Author:

cneumuel

Message:

some small refactorings (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs (modified) (6 diffs)

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

@@ -55 +55 @@
     }
 
-    public ResponseHB ProcessHeartBeat(HeartBeatData hbData) {
+    public ResponseHeartBeat ProcessHeartBeat(HeartBeatData hbData) {
       using (contextFactory.GetContext()) {
         return slaveCommunicator.ProcessHeartBeat(hbData);
@@ -61 +61 @@
     }
 
-    public ResponseJob SendJob(Guid clientId) {
+    public ResponseObject<JobDto> GetJob(Guid clientId) {
       using (contextFactory.GetContext()) {
-        return slaveCommunicator.SendJob(clientId);
+        return slaveCommunicator.GetJob(clientId);
       }
     }
@@ -85 +85 @@
     }
 
-    public ResponsePlugin SendPlugins(List<HivePluginInfoDto> pluginList) {
+    public ResponseList<CachedHivePluginInfoDto> SendPlugins(List<HivePluginInfoDto> pluginList) {
       return slaveCommunicator.SendPlugins(pluginList);      
     }
@@ -118 +118 @@
         MultiStream stream = new MultiStream();
 
-        ResponseJob job = null;
+        ResponseObject<JobDto> job = null;
 
-        job = ServiceLocator.GetSlaveCommunicator().SendJob(clientId);
+        job = ServiceLocator.GetSlaveCommunicator().GetJob(clientId);
 
         //first send response
-        stream.AddStream(new StreamedObject<ResponseJob>(job));
+        stream.AddStream(new StreamedObject<ResponseObject<JobDto>>(job));
 
         IJobManager jobManager = ServiceLocator.GetJobManager();
@@ -130 +130 @@
         //second stream the job binary data
         MemoryStream memoryStream = new MemoryStream();
-        if (job.Job != null)
-          stream.AddStream(new MemoryStream(internalJobManager.GetSerializedJobDataById(job.Job.Id)));
+        if (job.Obj != null)
+          stream.AddStream(new MemoryStream(internalJobManager.GetSerializedJobDataById(job.Obj.Id)));
 
         OperationContext clientContext = OperationContext.Current;
@@ -145 +145 @@
 
     public Stream SendStreamedPlugins(List<HivePluginInfoDto> pluginList) {
-      return new StreamedObject<ResponsePlugin>(this.SendPlugins(pluginList));
+      return new StreamedObject<ResponseList<CachedHivePluginInfoDto>>(this.SendPlugins(pluginList));
     }