You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/05/06 20:25:12 UTC
git commit: generate code and update references - AIRAVATA-1199
Repository: airavata
Updated Branches:
refs/heads/master 86f46412e -> 96fed6ec6
generate code and update references - AIRAVATA-1199
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/96fed6ec
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/96fed6ec
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/96fed6ec
Branch: refs/heads/master
Commit: 96fed6ec6a32853e9b7a561e32c06e3ee122fe86
Parents: 86f4641
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue May 6 14:25:06 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue May 6 14:25:06 2014 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 21 +++---
.../samples/CreateLaunchExperimentUS3.java | 33 ++++-----
.../workspace/experiment/DataObjectType.java | 34 +++++++---
.../model/workspace/experiment/DataType.java | 70 ++++++++++++++++++++
.../experimentModel.thrift | 6 --
.../airavata/gfac/core/utils/OutputUtils.java | 8 +--
.../gsissh/handler/GSISSHOutputHandler.java | 11 +--
.../gfac/ssh/handler/SSHOutputHandler.java | 2 +-
.../apache/airavata/integration/BaseCaseIT.java | 16 ++---
.../airavata/integration/DataRetrievalIT.java | 8 +--
.../airavata/integration/SimpleEchoIT.java | 10 +--
.../client/sample/OrchestratorClientSample.java | 10 +--
.../orchestrator/core/NewOrchestratorTest.java | 10 +--
.../core/OrchestratorTestWithMyProxyAuth.java | 14 +---
.../registry/jpa/impl/ExperimentRegistry.java | 26 ++++----
.../jpa/utils/ThriftDataModelConversion.java | 12 ++--
16 files changed, 159 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 7ef6783..19d9513 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -27,7 +27,6 @@ import org.apache.airavata.common.utils.ClientSettings;
import org.apache.airavata.model.util.ProjectModelUtil;
import org.apache.airavata.model.workspace.Project;
import org.apache.airavata.model.workspace.experiment.*;
-import org.apache.airavata.schemas.gfac.DataType;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
import org.apache.airavata.api.error.AiravataClientException;
@@ -170,14 +169,14 @@ public class CreateLaunchExperiment {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
@@ -224,14 +223,14 @@ public class CreateLaunchExperiment {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
@@ -270,14 +269,14 @@ public class CreateLaunchExperiment {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
@@ -315,14 +314,14 @@ public class CreateLaunchExperiment {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
@@ -361,14 +360,14 @@ public class CreateLaunchExperiment {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
index f915971..7ab8afc 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
@@ -21,14 +21,7 @@ import org.apache.airavata.common.utils.ClientSettings;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.util.ProjectModelUtil;
import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.model.workspace.experiment.AdvancedOutputDataHandling;
-import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
-import org.apache.airavata.model.workspace.experiment.DataObjectType;
-import org.apache.airavata.model.workspace.experiment.Experiment;
-import org.apache.airavata.model.workspace.experiment.JobState;
-import org.apache.airavata.model.workspace.experiment.JobStatus;
-import org.apache.airavata.model.workspace.experiment.UserConfigurationData;
-import org.apache.airavata.schemas.gfac.DataType;
+import org.apache.airavata.model.workspace.experiment.*;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -137,14 +130,14 @@ public class CreateLaunchExperimentUS3 {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
@@ -183,22 +176,22 @@ public class CreateLaunchExperimentUS3 {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("input");
- input.setType(DataType.URI.toString());
+ input.setType(DataType.URI);
input.setValue("file:///home/airavata/input/hpcinput.tar");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("output");
- output.setType(DataType.URI.toString());
+ output.setType(DataType.URI);
output.setValue("");
DataObjectType output1 = new DataObjectType();
output1.setKey("stdout");
- output1.setType(DataType.STD_OUT.toString());
+ output1.setType(DataType.STDOUT);
output1.setValue("");
DataObjectType output2 = new DataObjectType();
output2.setKey("stderr");
- output2.setType(DataType.STD_ERR.toString());
+ output2.setType(DataType.STDERR);
output2.setValue("");
exOut.add(output);
exOut.add(output1);
@@ -243,22 +236,22 @@ public class CreateLaunchExperimentUS3 {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("input");
- input.setType(DataType.URI.toString());
+ input.setType(DataType.URI);
input.setValue("file:///home/airavata/input/hpcinput.tar");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("output");
- output.setType(DataType.URI.toString());
+ output.setType(DataType.URI);
output.setValue("");
DataObjectType output1 = new DataObjectType();
output1.setKey("stdout");
- output1.setType(DataType.STD_OUT.toString());
+ output1.setType(DataType.STDOUT);
output1.setValue("");
DataObjectType output2 = new DataObjectType();
output2.setKey("stderr");
- output2.setType(DataType.STD_ERR.toString());
+ output2.setType(DataType.STDERR);
output2.setValue("");
exOut.add(output);
exOut.add(output1);
@@ -304,14 +297,14 @@ public class CreateLaunchExperimentUS3 {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataObjectType.java
index 22d4192..2535f99 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataObjectType.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)3);
private static final org.apache.thrift.protocol.TField META_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("metaData", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -68,13 +68,17 @@ import org.slf4j.LoggerFactory;
private String key; // required
private String value; // optional
- private String type; // optional
+ private DataType type; // optional
private String metaData; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
KEY((short)1, "key"),
VALUE((short)2, "value"),
+ /**
+ *
+ * @see DataType
+ */
TYPE((short)3, "type"),
META_DATA((short)4, "metaData");
@@ -148,7 +152,7 @@ import org.slf4j.LoggerFactory;
tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DataType.class)));
tmpMap.put(_Fields.META_DATA, new org.apache.thrift.meta_data.FieldMetaData("metaData", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -241,11 +245,19 @@ import org.slf4j.LoggerFactory;
}
}
- public String getType() {
+ /**
+ *
+ * @see DataType
+ */
+ public DataType getType() {
return this.type;
}
- public void setType(String type) {
+ /**
+ *
+ * @see DataType
+ */
+ public void setType(DataType type) {
this.type = type;
}
@@ -309,7 +321,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetType();
} else {
- setType((String)value);
+ setType((DataType)value);
}
break;
@@ -587,8 +599,8 @@ import org.slf4j.LoggerFactory;
}
break;
case 3: // TYPE
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.type = iprot.readString();
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.type = DataType.findByValue(iprot.readI32());
struct.setTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -630,7 +642,7 @@ import org.slf4j.LoggerFactory;
if (struct.type != null) {
if (struct.isSetType()) {
oprot.writeFieldBegin(TYPE_FIELD_DESC);
- oprot.writeString(struct.type);
+ oprot.writeI32(struct.type.getValue());
oprot.writeFieldEnd();
}
}
@@ -674,7 +686,7 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.value);
}
if (struct.isSetType()) {
- oprot.writeString(struct.type);
+ oprot.writeI32(struct.type.getValue());
}
if (struct.isSetMetaData()) {
oprot.writeString(struct.metaData);
@@ -692,7 +704,7 @@ import org.slf4j.LoggerFactory;
struct.setValueIsSet(true);
}
if (incoming.get(1)) {
- struct.type = iprot.readString();
+ struct.type = DataType.findByValue(iprot.readI32());
struct.setTypeIsSet(true);
}
if (incoming.get(2)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataType.java
new file mode 100644
index 0000000..eceb638
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/DataType.java
@@ -0,0 +1,70 @@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.9.1)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.airavata.model.workspace.experiment;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+@SuppressWarnings("all") public enum DataType implements org.apache.thrift.TEnum {
+ STRING(0),
+ INTEGER(1),
+ URI(2),
+ STDOUT(3),
+ STDERR(4);
+
+ private final int value;
+
+ private DataType(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static DataType findByValue(int value) {
+ switch (value) {
+ case 0:
+ return STRING;
+ case 1:
+ return INTEGER;
+ case 2:
+ return URI;
+ case 3:
+ return STDOUT;
+ case 4:
+ return STDERR;
+ default:
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/airavata-api/thrift-interface-descriptions/experimentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
index bb627ae..f4aa6b8 100644
--- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
@@ -178,12 +178,6 @@ enum CorrectiveAction {
CANNOT_BE_DETERMINED
}
-enum CorrectiveAction {
- RETRY_SUBMISSION,
- CONTACT_SUPPORT,
- CANNOT_BE_DETERMINED
-}
-
enum DataType{
STRING,
INTEGER,
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutputUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutputUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutputUtils.java
index 6acddf8..f9cc10b 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutputUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutputUtils.java
@@ -31,8 +31,8 @@ import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.MappingFactory;
import org.apache.airavata.model.workspace.experiment.DataObjectType;
-import org.apache.airavata.schemas.gfac.DataType;
import org.apache.airavata.gfac.core.handler.GFacHandlerException;
+import org.apache.airavata.model.workspace.experiment.DataType;
import org.apache.airavata.schemas.gfac.StdErrParameterType;
import org.apache.airavata.schemas.gfac.StdOutParameterType;
@@ -92,13 +92,13 @@ public class OutputUtils {
if ("StdOut".equals(actual.getType().getType().toString())) {
DataObjectType out = new DataObjectType();
out.setKey(paramName);
- out.setType(DataType.STD_OUT.toString());
+ out.setType(DataType.STDOUT);
out.setValue(stdout);
outputArray.add(out);
} else if ("StdErr".equals(actual.getType().getType().toString())) {
DataObjectType out = new DataObjectType();
out.setKey(paramName);
- out.setType(DataType.STD_ERR.toString());
+ out.setType(DataType.STDERR);
out.setValue(stderr);
outputArray.add(out);
}else if("URI".equals(actual.getType().getType().toString())){
@@ -109,7 +109,7 @@ public class OutputUtils {
if (parseStdout != null) {
DataObjectType out = new DataObjectType();
out.setKey(paramName);
- out.setType(DataType.STRING.toString());
+ out.setType(DataType.STRING);
out.setValue(parseStdout);
outputArray.add(out);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
index 2f1bc13..c58810d 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
@@ -45,14 +45,7 @@ import org.apache.airavata.gfac.gsissh.security.GSISecurityContext;
import org.apache.airavata.gfac.gsissh.util.GFACGSISSHUtils;
import org.apache.airavata.gsi.ssh.api.Cluster;
import org.apache.airavata.gsi.ssh.api.job.JobDescriptor;
-import org.apache.airavata.model.workspace.experiment.CorrectiveAction;
-import org.apache.airavata.model.workspace.experiment.DataObjectType;
-import org.apache.airavata.model.workspace.experiment.DataTransferDetails;
-import org.apache.airavata.model.workspace.experiment.ErrorCategory;
-import org.apache.airavata.model.workspace.experiment.JobDetails;
-import org.apache.airavata.model.workspace.experiment.TaskDetails;
-import org.apache.airavata.model.workspace.experiment.TransferState;
-import org.apache.airavata.model.workspace.experiment.TransferStatus;
+import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.registry.cpi.ChildDataType;
import org.apache.airavata.registry.cpi.RegistryModelType;
import org.apache.airavata.registry.cpi.RegistryException;
@@ -184,7 +177,7 @@ public class GSISSHOutputHandler extends AbstractHandler {
DataObjectType dataObjectType = new DataObjectType();
dataObjectType.setValue(valueList);
dataObjectType.setKey(paramName);
- dataObjectType.setType(org.apache.airavata.schemas.gfac.DataType.URI.toString());
+ dataObjectType.setType(DataType.URI);
outputArray.add(dataObjectType);
}
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
index c381805..63ed192 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
@@ -177,7 +177,7 @@ public class SSHOutputHandler extends AbstractHandler {
DataObjectType dataObjectType = new DataObjectType();
dataObjectType.setValue(valueList);
dataObjectType.setKey(paramName);
- dataObjectType.setType(org.apache.airavata.schemas.gfac.DataType.URI.toString());
+ dataObjectType.setType(DataType.URI);
outputArray.add(dataObjectType);
}
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
index 8b771fc..5a9361a 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
@@ -33,14 +33,8 @@ import org.apache.airavata.client.tools.DocumentCreator;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.util.ProjectModelUtil;
import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
-import org.apache.airavata.model.workspace.experiment.DataObjectType;
-import org.apache.airavata.model.workspace.experiment.Experiment;
-import org.apache.airavata.model.workspace.experiment.JobState;
-import org.apache.airavata.model.workspace.experiment.JobStatus;
-import org.apache.airavata.model.workspace.experiment.UserConfigurationData;
+import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.registry.api.workflow.ApplicationJob;
-import org.apache.airavata.schemas.gfac.DataType;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.ws.monitor.EventData;
import org.apache.airavata.ws.monitor.EventDataListenerAdapter;
@@ -91,14 +85,14 @@ public class BaseCaseIT extends WorkflowIntegrationTestBase {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
@@ -165,14 +159,14 @@ public class BaseCaseIT extends WorkflowIntegrationTestBase {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
index ff3847f..28faf15 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
@@ -38,11 +38,7 @@ import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.util.ProjectModelUtil;
import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
-import org.apache.airavata.model.workspace.experiment.DataObjectType;
-import org.apache.airavata.model.workspace.experiment.Experiment;
-import org.apache.airavata.model.workspace.experiment.UserConfigurationData;
-import org.apache.airavata.schemas.gfac.DataType;
+import org.apache.airavata.model.workspace.experiment.*;
import org.apache.thrift.TException;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
@@ -198,7 +194,7 @@ public class DataRetrievalIT extends AbstractIntegrationTest {
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java
index caf6850..02fc6c8 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java
@@ -28,11 +28,7 @@ import org.apache.airavata.client.tools.DocumentCreator;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.util.ProjectModelUtil;
import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
-import org.apache.airavata.model.workspace.experiment.DataObjectType;
-import org.apache.airavata.model.workspace.experiment.Experiment;
-import org.apache.airavata.model.workspace.experiment.UserConfigurationData;
-import org.apache.airavata.schemas.gfac.DataType;
+import org.apache.airavata.model.workspace.experiment.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeTest;
@@ -62,14 +58,14 @@ public class SimpleEchoIT extends SingleAppIntegrationTestBase {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java b/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
index 00ac042..e7c5a13 100644
--- a/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
+++ b/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
@@ -29,16 +29,12 @@ import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ClientSettings;
import org.apache.airavata.model.util.ExperimentModelUtil;
-import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
-import org.apache.airavata.model.workspace.experiment.DataObjectType;
-import org.apache.airavata.model.workspace.experiment.Experiment;
-import org.apache.airavata.model.workspace.experiment.UserConfigurationData;
+import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.orchestrator.client.OrchestratorClientFactory;
import org.apache.airavata.orchestrator.cpi.OrchestratorService;
import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory;
import org.apache.airavata.registry.cpi.ParentDataType;
import org.apache.airavata.registry.cpi.Registry;
-import org.apache.airavata.schemas.gfac.DataType;
import org.apache.thrift.TException;
import java.util.ArrayList;
@@ -92,7 +88,7 @@ public class OrchestratorClientSample {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
@@ -100,7 +96,7 @@ public class OrchestratorClientSample {
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
index 7bc6e63..fd13cd4 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
@@ -20,7 +20,6 @@
*/
package org.apache.airavata.orchestrator.core;
-import junit.framework.Assert;
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
@@ -32,19 +31,14 @@ import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.orchestrator.cpi.Orchestrator;
import org.apache.airavata.orchestrator.cpi.impl.SimpleOrchestratorImpl;
import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory;
-import org.apache.airavata.persistance.registry.jpa.impl.RegistryImpl;
-import org.apache.airavata.registry.cpi.ChildDataType;
import org.apache.airavata.registry.cpi.ParentDataType;
import org.apache.airavata.registry.cpi.Registry;
-import org.apache.airavata.schemas.gfac.DataType;
-import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
public class NewOrchestratorTest extends BaseOrchestratorTest {
@@ -74,14 +68,14 @@ public class NewOrchestratorTest extends BaseOrchestratorTest {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
index 88be61d..f3d6768 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
@@ -20,30 +20,20 @@
*/
package org.apache.airavata.orchestrator.core;
-import junit.framework.Assert;
-
-import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.common.utils.ApplicationSettings;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.orchestrator.cpi.Orchestrator;
import org.apache.airavata.orchestrator.cpi.impl.SimpleOrchestratorImpl;
import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory;
-import org.apache.airavata.persistance.registry.jpa.impl.RegistryImpl;
-import org.apache.airavata.persistance.registry.jpa.model.TaskDetail;
-import org.apache.airavata.registry.cpi.ChildDataType;
import org.apache.airavata.registry.cpi.ParentDataType;
import org.apache.airavata.registry.cpi.Registry;
-import org.apache.airavata.schemas.gfac.DataType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
-import java.net.URL;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
public class OrchestratorTestWithMyProxyAuth extends BaseOrchestratorTest {
@@ -71,14 +61,14 @@ public class OrchestratorTestWithMyProxyAuth extends BaseOrchestratorTest {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
index cd5b5aa..3c0e1b5 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
@@ -261,7 +261,7 @@ public class ExperimentRegistry {
resource.setExperimentResource(experimentResource);
resource.setExperimentKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType());
+ resource.setInputType(input.getType().toString());
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -278,7 +278,7 @@ public class ExperimentRegistry {
for (ExperimentInputResource exinput : experimentInputs) {
if (exinput.getExperimentKey().equals(input.getKey())) {
exinput.setValue(input.getValue());
- exinput.setInputType(input.getType());
+ exinput.setInputType(input.getType().toString());
exinput.setMetadata(input.getMetaData());
exinput.save();
}
@@ -299,7 +299,7 @@ public class ExperimentRegistry {
resource.setExperimentResource(experiment);
resource.setExperimentKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType());
+ resource.setOutputType(output.getType().toString());
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -320,7 +320,7 @@ public class ExperimentRegistry {
resource.setExperimentResource(experiment);
resource.setExperimentKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType());
+ resource.setOutputType(output.getType().toString());
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -341,7 +341,7 @@ public class ExperimentRegistry {
resource.setNodeDetailResource(workflowNode);
resource.setOutputKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType());
+ resource.setOutputType(output.getType().toString());
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -362,7 +362,7 @@ public class ExperimentRegistry {
resource.setNodeDetailResource(workflowNode);
resource.setOutputKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType());
+ resource.setOutputType(output.getType().toString());
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -383,7 +383,7 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetail);
resource.setOutputKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType());
+ resource.setOutputType(output.getType().toString());
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -779,7 +779,7 @@ public class ExperimentRegistry {
resource.setNodeDetailResource(nodeDetailResource);
resource.setInputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType());
+ resource.setInputType(input.getType().toString());
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -798,7 +798,7 @@ public class ExperimentRegistry {
resource.setNodeDetailResource(nodeDetailResource);
resource.setInputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType());
+ resource.setInputType(input.getType().toString());
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -951,7 +951,7 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetailResource);
resource.setInputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType());
+ resource.setInputType(input.getType().toString());
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -969,7 +969,7 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetailResource);
resource.setOutputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setOutputType(input.getType());
+ resource.setOutputType(input.getType().toString());
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -991,7 +991,7 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetail);
resource.setOutputKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType());
+ resource.setOutputType(output.getType().toString());
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -1010,7 +1010,7 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetailResource);
resource.setInputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType());
+ resource.setInputType(input.getType().toString());
resource.setMetadata(input.getMetaData());
resource.save();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/96fed6ec/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
index 098b206..7ee89c3 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
@@ -111,42 +111,42 @@ public class ThriftDataModelConversion {
ExperimentInputResource expInput = (ExperimentInputResource) object;
dataObjectType.setKey(expInput.getExperimentKey());
dataObjectType.setValue(expInput.getValue());
- dataObjectType.setType(expInput.getInputType());
+ dataObjectType.setType(DataType.valueOf(expInput.getInputType()));
dataObjectType.setMetaData(expInput.getMetadata());
return dataObjectType;
}else if (object instanceof ExperimentOutputResource){
ExperimentOutputResource expOutput = (ExperimentOutputResource)object;
dataObjectType.setKey(expOutput.getExperimentKey());
dataObjectType.setValue(expOutput.getValue());
- dataObjectType.setType(expOutput.getOutputType());
+ dataObjectType.setType(DataType.valueOf(expOutput.getOutputType()));
dataObjectType.setMetaData(expOutput.getMetadata());
return dataObjectType;
}else if (object instanceof NodeInputResource){
NodeInputResource nodeInputResource = (NodeInputResource)object;
dataObjectType.setKey(nodeInputResource.getInputKey());
dataObjectType.setValue(nodeInputResource.getValue());
- dataObjectType.setType(nodeInputResource.getInputType());
+ dataObjectType.setType(DataType.valueOf(nodeInputResource.getInputType()));
dataObjectType.setMetaData(nodeInputResource.getMetadata());
return dataObjectType;
}else if (object instanceof NodeOutputResource){
NodeOutputResource nodeOutputResource = (NodeOutputResource)object;
dataObjectType.setKey(nodeOutputResource.getOutputKey());
dataObjectType.setValue(nodeOutputResource.getValue());
- dataObjectType.setType(nodeOutputResource.getOutputType());
+ dataObjectType.setType(DataType.valueOf(nodeOutputResource.getOutputType()));
dataObjectType.setMetaData(nodeOutputResource.getMetadata());
return dataObjectType;
}else if (object instanceof ApplicationInputResource){
ApplicationInputResource inputResource = (ApplicationInputResource)object;
dataObjectType.setKey(inputResource.getInputKey());
dataObjectType.setValue(inputResource.getValue());
- dataObjectType.setType(inputResource.getInputType());
+ dataObjectType.setType(DataType.valueOf(inputResource.getInputType()));
dataObjectType.setMetaData(inputResource.getMetadata());
return dataObjectType;
}else if (object instanceof ApplicationOutputResource){
ApplicationOutputResource outputResource = (ApplicationOutputResource)object;
dataObjectType.setKey(outputResource.getOutputKey());
dataObjectType.setValue(outputResource.getValue());
- dataObjectType.setType(outputResource.getOutputType());
+ dataObjectType.setType(DataType.valueOf(outputResource.getOutputType()));
dataObjectType.setMetaData(outputResource.getMetadata());
return dataObjectType;
}else {