airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] 01/02: AIRAVATA-2806 Removing duplicate methods
Date Fri, 03 Aug 2018 20:07:44 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 825218d752e85b9b9d5756ab7da632a4f9abefce
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Fri Aug 3 16:04:31 2018 -0400

    AIRAVATA-2806 Removing duplicate methods
---
 .../java/org/apache/airavata/gfac/core/GFacUtils.java  |  2 +-
 .../airavata/gfac/core/context/ProcessContext.java     | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 826f226..a86cbbd 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -802,7 +802,7 @@ public class GFacUtils {
     public static JobSubmissionInterface getPreferredJobSubmissionInterface(ProcessContext
processContext, RegistryService.Client registryClient) throws TException, ApplicationSettingsException
{
         try {
             String resourceHostId = processContext.getComputeResourceDescription().getComputeResourceId();
-            JobSubmissionProtocol preferredJobSubmissionProtocol = processContext.getPreferredJobSubmissionProtocol();
+            JobSubmissionProtocol preferredJobSubmissionProtocol = processContext.getJobSubmissionProtocol();
             ComputeResourceDescription resourceDescription = registryClient.getComputeResource(resourceHostId);
             List<JobSubmissionInterface> jobSubmissionInterfaces = resourceDescription.getJobSubmissionInterfaces();
             Map<JobSubmissionProtocol, List<JobSubmissionInterface>> orderedInterfaces
= new HashMap<>();
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index 83e5ec0..552028e 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -486,24 +486,6 @@ public class ProcessContext {
 		}
 	}
 
-	public JobSubmissionProtocol getPreferredJobSubmissionProtocol(){
-	    if (isSetGroupResourceProfile() &&
-                groupComputeResourcePreference != null &&
-                groupComputeResourcePreference.getPreferredJobSubmissionProtocol() != null)
{
-	        return groupComputeResourcePreference.getPreferredJobSubmissionProtocol();
-        }
-        return gatewayComputeResourcePreference.getPreferredJobSubmissionProtocol();
-	}
-
-	public DataMovementProtocol getPreferredDataMovementProtocol() {
-	    if (isSetGroupResourceProfile() &&
-                groupComputeResourcePreference != null &&
-                groupComputeResourcePreference.getPreferredDataMovementProtocol() != null)
{
-	        return groupComputeResourcePreference.getPreferredDataMovementProtocol();
-        }
-        return gatewayComputeResourcePreference.getPreferredDataMovementProtocol();
-	}
-
 	public void setMonitorMode(MonitorMode monitorMode) {
 		this.monitorMode = monitorMode;
 	}


Mime
View raw message