You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2012/03/09 19:24:33 UTC
svn commit: r1298960 -
/incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
Author: heshan
Date: Fri Mar 9 18:24:32 2012
New Revision: 1298960
URL: http://svn.apache.org/viewvc?rev=1298960&view=rev
Log:
Intorudced util methods.
Modified:
incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
Modified: incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java?rev=1298960&r1=1298959&r2=1298960&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java (original)
+++ incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/MigrationUtil.java Fri Mar 9 18:24:32 2012
@@ -226,20 +226,12 @@ public class MigrationUtil {
gram.setJobType(getJobTypeEnum(appBean.getJobType()));
ProjectAccountType projectAccount;
- if(gram.getProjectAccount() != null) {
- projectAccount = gram.getProjectAccount();
- } else {
- projectAccount = gram.addNewProjectAccount();
- }
+ projectAccount = getProjectAccountType(gram);
projectAccount.setProjectAccountNumber(appBean.getProjectName());
projectAccount.setProjectAccountDescription("");
QueueType queueName;
- if(gram.getQueue() != null) {
- queueName = gram.getQueue();
- } else {
- queueName = gram.addNewQueue();
- }
+ queueName = getQueueType(gram);
queueName.setQueueName(appBean.getQueue());
} else {
@@ -256,6 +248,16 @@ public class MigrationUtil {
}
+ private static ProjectAccountType getProjectAccountType(GramApplicationDeploymentType gram) {
+ ProjectAccountType projectAccount;
+ if(gram.getProjectAccount() != null) {
+ projectAccount = gram.getProjectAccount();
+ } else {
+ projectAccount = gram.addNewProjectAccount();
+ }
+ return projectAccount;
+ }
+
/**
* Creates ApplicationDeploymentDescription from ApplicationBean with a the provided
* applicationName
@@ -288,20 +290,12 @@ public class MigrationUtil {
gram.setJobType(getJobTypeEnum(appBean.getJobType()));
ProjectAccountType projectAccount;
- if(gram.getProjectAccount() != null) {
- projectAccount = gram.getProjectAccount();
- } else {
- projectAccount = gram.addNewProjectAccount();
- }
+ projectAccount = getProjectAccountType(gram);
projectAccount.setProjectAccountNumber(appBean.getProjectName());
projectAccount.setProjectAccountDescription("");
QueueType queueName;
- if(gram.getQueue() != null) {
- queueName = gram.getQueue();
- } else {
- queueName = gram.addNewQueue();
- }
+ queueName = getQueueType(gram);
queueName.setQueueName(appBean.getQueue());
} else {
@@ -317,6 +311,16 @@ public class MigrationUtil {
return appDesc;
}
+ private static QueueType getQueueType(GramApplicationDeploymentType gram) {
+ QueueType queueName;
+ if(gram.getQueue() != null) {
+ queueName = gram.getQueue();
+ } else {
+ queueName = gram.addNewQueue();
+ }
+ return queueName;
+ }
+
private static JobTypeType.Enum getJobTypeEnum(String jobTypeString){
for (JobTypeType.Enum jobTypeEnum : getJobTypes()) {
if (jobTypeEnum.toString().equalsIgnoreCase(jobTypeString)){