You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/06/11 19:12:15 UTC
[05/16] airavata git commit: Updating Airavata to use Thrift version
0.9.2 - AIRAVATA-1707
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
index 08af3df..683725c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,10 +46,13 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@SuppressWarnings("all") public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -67,7 +70,7 @@ import org.slf4j.LoggerFactory;
private List<String> globusGateKeeperEndPoint; // 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
/**
*
@@ -135,7 +138,7 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private _Fields optionals[] = {_Fields.GLOBUS_GATE_KEEPER_END_POINT};
+ private static final _Fields optionals[] = {_Fields.GLOBUS_GATE_KEEPER_END_POINT};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -390,7 +393,24 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_jobSubmissionInterfaceId = true && (isSetJobSubmissionInterfaceId());
+ list.add(present_jobSubmissionInterfaceId);
+ if (present_jobSubmissionInterfaceId)
+ list.add(jobSubmissionInterfaceId);
+
+ boolean present_securityProtocol = true && (isSetSecurityProtocol());
+ list.add(present_securityProtocol);
+ if (present_securityProtocol)
+ list.add(securityProtocol.getValue());
+
+ boolean present_globusGateKeeperEndPoint = true && (isSetGlobusGateKeeperEndPoint());
+ list.add(present_globusGateKeeperEndPoint);
+ if (present_globusGateKeeperEndPoint)
+ list.add(globusGateKeeperEndPoint);
+
+ return list.hashCode();
}
@Override
@@ -537,7 +557,7 @@ import org.slf4j.LoggerFactory;
break;
case 2: // SECURITY_PROTOCOL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -548,11 +568,11 @@ import org.slf4j.LoggerFactory;
{
org.apache.thrift.protocol.TList _list18 = iprot.readListBegin();
struct.globusGateKeeperEndPoint = new ArrayList<String>(_list18.size);
- for (int _i19 = 0; _i19 < _list18.size; ++_i19)
+ String _elem19;
+ for (int _i20 = 0; _i20 < _list18.size; ++_i20)
{
- String _elem20;
- _elem20 = iprot.readString();
- struct.globusGateKeeperEndPoint.add(_elem20);
+ _elem19 = iprot.readString();
+ struct.globusGateKeeperEndPoint.add(_elem19);
}
iprot.readListEnd();
}
@@ -638,18 +658,18 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.jobSubmissionInterfaceId = iprot.readString();
struct.setJobSubmissionInterfaceIdIsSet(true);
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.globusGateKeeperEndPoint = new ArrayList<String>(_list23.size);
- for (int _i24 = 0; _i24 < _list23.size; ++_i24)
+ String _elem24;
+ for (int _i25 = 0; _i25 < _list23.size; ++_i25)
{
- String _elem25;
- _elem25 = iprot.readString();
- struct.globusGateKeeperEndPoint.add(_elem25);
+ _elem24 = iprot.readString();
+ struct.globusGateKeeperEndPoint.add(_elem24);
}
}
struct.setGlobusGateKeeperEndPointIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
index 4a575f8..397250d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Data Movement through GridFTP
*
@@ -58,7 +60,8 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@SuppressWarnings("all") public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -76,7 +79,7 @@ import org.slf4j.LoggerFactory;
private List<String> gridFTPEndPoints; // required
/** 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"),
/**
*
@@ -400,7 +403,24 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId());
+ list.add(present_dataMovementInterfaceId);
+ if (present_dataMovementInterfaceId)
+ list.add(dataMovementInterfaceId);
+
+ boolean present_securityProtocol = true && (isSetSecurityProtocol());
+ list.add(present_securityProtocol);
+ if (present_securityProtocol)
+ list.add(securityProtocol.getValue());
+
+ boolean present_gridFTPEndPoints = true && (isSetGridFTPEndPoints());
+ list.add(present_gridFTPEndPoints);
+ if (present_gridFTPEndPoints)
+ list.add(gridFTPEndPoints);
+
+ return list.hashCode();
}
@Override
@@ -549,7 +569,7 @@ import org.slf4j.LoggerFactory;
break;
case 2: // SECURITY_PROTOCOL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -560,11 +580,11 @@ import org.slf4j.LoggerFactory;
{
org.apache.thrift.protocol.TList _list10 = iprot.readListBegin();
struct.gridFTPEndPoints = new ArrayList<String>(_list10.size);
- for (int _i11 = 0; _i11 < _list10.size; ++_i11)
+ String _elem11;
+ for (int _i12 = 0; _i12 < _list10.size; ++_i12)
{
- String _elem12;
- _elem12 = iprot.readString();
- struct.gridFTPEndPoints.add(_elem12);
+ _elem11 = iprot.readString();
+ struct.gridFTPEndPoints.add(_elem11);
}
iprot.readListEnd();
}
@@ -641,16 +661,16 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.dataMovementInterfaceId = iprot.readString();
struct.setDataMovementInterfaceIdIsSet(true);
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
{
org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.gridFTPEndPoints = new ArrayList<String>(_list15.size);
- for (int _i16 = 0; _i16 < _list15.size; ++_i16)
+ String _elem16;
+ for (int _i17 = 0; _i17 < _list15.size; ++_i17)
{
- String _elem17;
- _elem17 = iprot.readString();
- struct.gridFTPEndPoints.add(_elem17);
+ _elem16 = iprot.readString();
+ struct.gridFTPEndPoints.add(_elem16);
}
}
struct.setGridFTPEndPointsIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
index 209dd10..735ed22 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -53,7 +53,7 @@ import org.apache.thrift.TEnum;
* Display the start time of the specified job. Ex: showstart
*
*/
-@SuppressWarnings("all") public enum JobManagerCommand implements org.apache.thrift.TEnum {
+public enum JobManagerCommand implements org.apache.thrift.TEnum {
SUBMISSION(0),
JOB_MONITORING(1),
DELETION(2),
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
index be4059f..2dbb356 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Job Submission Interfaces
*
@@ -59,7 +61,8 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@SuppressWarnings("all") public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface");
private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -77,7 +80,7 @@ import org.slf4j.LoggerFactory;
private int priorityOrder; // required
/** 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
/**
*
@@ -385,7 +388,24 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_jobSubmissionInterfaceId = true && (isSetJobSubmissionInterfaceId());
+ list.add(present_jobSubmissionInterfaceId);
+ if (present_jobSubmissionInterfaceId)
+ list.add(jobSubmissionInterfaceId);
+
+ boolean present_jobSubmissionProtocol = true && (isSetJobSubmissionProtocol());
+ list.add(present_jobSubmissionProtocol);
+ if (present_jobSubmissionProtocol)
+ list.add(jobSubmissionProtocol.getValue());
+
+ boolean present_priorityOrder = true;
+ list.add(present_priorityOrder);
+ if (present_priorityOrder)
+ list.add(priorityOrder);
+
+ return list.hashCode();
}
@Override
@@ -532,7 +552,7 @@ import org.slf4j.LoggerFactory;
break;
case 2: // JOB_SUBMISSION_PROTOCOL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.jobSubmissionProtocol = JobSubmissionProtocol.findByValue(iprot.readI32());
+ struct.jobSubmissionProtocol = org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.findByValue(iprot.readI32());
struct.setJobSubmissionProtocolIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -599,7 +619,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.jobSubmissionInterfaceId = iprot.readString();
struct.setJobSubmissionInterfaceIdIsSet(true);
- struct.jobSubmissionProtocol = JobSubmissionProtocol.findByValue(iprot.readI32());
+ struct.jobSubmissionProtocol = org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.findByValue(iprot.readI32());
struct.setJobSubmissionProtocolIsSet(true);
struct.priorityOrder = iprot.readI32();
struct.setPriorityOrderIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
index 8ce1ae4..ada86ad 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -41,7 +41,7 @@ import org.apache.thrift.TEnum;
* Execute remote jobs via Unicore services
*
*/
-@SuppressWarnings("all") public enum JobSubmissionProtocol implements org.apache.thrift.TEnum {
+public enum JobSubmissionProtocol implements org.apache.thrift.TEnum {
LOCAL(0),
SSH(1),
GLOBUS(2),
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
index 1553a79..019c787 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* LOCAL
*
@@ -58,7 +60,8 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@SuppressWarnings("all") public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement");
private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -72,7 +75,7 @@ import org.slf4j.LoggerFactory;
private String dataMovementInterfaceId; // required
/** 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -255,7 +258,14 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId());
+ list.add(present_dataMovementInterfaceId);
+ if (present_dataMovementInterfaceId)
+ list.add(dataMovementInterfaceId);
+
+ return list.hashCode();
}
@Override
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
index fe2d9ea..b12a056 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Locally Fork Jobs as OS processes
*
@@ -58,7 +60,8 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@SuppressWarnings("all") public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission");
private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -74,7 +77,7 @@ import org.slf4j.LoggerFactory;
private ResourceJobManager resourceJobManager; // required
/** 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
RESOURCE_JOB_MANAGER((short)2, "resourceJobManager");
@@ -313,7 +316,19 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_jobSubmissionInterfaceId = true && (isSetJobSubmissionInterfaceId());
+ list.add(present_jobSubmissionInterfaceId);
+ if (present_jobSubmissionInterfaceId)
+ list.add(jobSubmissionInterfaceId);
+
+ boolean present_resourceJobManager = true && (isSetResourceJobManager());
+ list.add(present_resourceJobManager);
+ if (present_resourceJobManager)
+ list.add(resourceJobManager);
+
+ return list.hashCode();
}
@Override
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
index 53cadd7..1c70821 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -39,7 +39,7 @@ import org.apache.thrift.TEnum;
*
*
*/
-@SuppressWarnings("all") public enum MonitorMode implements org.apache.thrift.TEnum {
+public enum MonitorMode implements org.apache.thrift.TEnum {
POLL_JOB_MANAGER(0),
JOB_EMAIL_NOTIFICATION_MONITOR(1),
XSEDE_AMQP_SUBSCRIBE(2);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
index 27fcbd1..97a6b61 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -32,7 +32,7 @@ import org.apache.thrift.TEnum;
* Provider name
*
*/
-@SuppressWarnings("all") public enum ProviderName implements org.apache.thrift.TEnum {
+public enum ProviderName implements org.apache.thrift.TEnum {
EC2(0),
AWSEC2(1),
RACKSPACE(2);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
index 680a40a..aecbf35 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Resource Job Manager Information
*
@@ -66,7 +68,8 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@SuppressWarnings("all") public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager");
private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceJobManagerId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -88,7 +91,7 @@ import org.slf4j.LoggerFactory;
private Map<JobManagerCommand,String> jobManagerCommands; // 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
RESOURCE_JOB_MANAGER_ID((short)1, "resourceJobManagerId"),
/**
*
@@ -162,7 +165,7 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS};
+ private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -527,7 +530,34 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_resourceJobManagerId = true && (isSetResourceJobManagerId());
+ list.add(present_resourceJobManagerId);
+ if (present_resourceJobManagerId)
+ list.add(resourceJobManagerId);
+
+ boolean present_resourceJobManagerType = true && (isSetResourceJobManagerType());
+ list.add(present_resourceJobManagerType);
+ if (present_resourceJobManagerType)
+ list.add(resourceJobManagerType.getValue());
+
+ boolean present_pushMonitoringEndpoint = true && (isSetPushMonitoringEndpoint());
+ list.add(present_pushMonitoringEndpoint);
+ if (present_pushMonitoringEndpoint)
+ list.add(pushMonitoringEndpoint);
+
+ boolean present_jobManagerBinPath = true && (isSetJobManagerBinPath());
+ list.add(present_jobManagerBinPath);
+ if (present_jobManagerBinPath)
+ list.add(jobManagerBinPath);
+
+ boolean present_jobManagerCommands = true && (isSetJobManagerCommands());
+ list.add(present_jobManagerCommands);
+ if (present_jobManagerCommands)
+ list.add(jobManagerCommands);
+
+ return list.hashCode();
}
@Override
@@ -714,7 +744,7 @@ import org.slf4j.LoggerFactory;
break;
case 2: // RESOURCE_JOB_MANAGER_TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.resourceJobManagerType = ResourceJobManagerType.findByValue(iprot.readI32());
+ struct.resourceJobManagerType = org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType.findByValue(iprot.readI32());
struct.setResourceJobManagerTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -741,13 +771,13 @@ import org.slf4j.LoggerFactory;
{
org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
struct.jobManagerCommands = new HashMap<JobManagerCommand,String>(2*_map0.size);
- for (int _i1 = 0; _i1 < _map0.size; ++_i1)
+ JobManagerCommand _key1;
+ String _val2;
+ for (int _i3 = 0; _i3 < _map0.size; ++_i3)
{
- JobManagerCommand _key2;
- String _val3;
- _key2 = JobManagerCommand.findByValue(iprot.readI32());
- _val3 = iprot.readString();
- struct.jobManagerCommands.put(_key2, _val3);
+ _key1 = org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand.findByValue(iprot.readI32());
+ _val2 = iprot.readString();
+ struct.jobManagerCommands.put(_key1, _val2);
}
iprot.readMapEnd();
}
@@ -861,7 +891,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.resourceJobManagerId = iprot.readString();
struct.setResourceJobManagerIdIsSet(true);
- struct.resourceJobManagerType = ResourceJobManagerType.findByValue(iprot.readI32());
+ struct.resourceJobManagerType = org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType.findByValue(iprot.readI32());
struct.setResourceJobManagerTypeIsSet(true);
BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
@@ -876,13 +906,13 @@ import org.slf4j.LoggerFactory;
{
org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.jobManagerCommands = new HashMap<JobManagerCommand,String>(2*_map6.size);
- for (int _i7 = 0; _i7 < _map6.size; ++_i7)
+ JobManagerCommand _key7;
+ String _val8;
+ for (int _i9 = 0; _i9 < _map6.size; ++_i9)
{
- JobManagerCommand _key8;
- String _val9;
- _key8 = JobManagerCommand.findByValue(iprot.readI32());
- _val9 = iprot.readString();
- struct.jobManagerCommands.put(_key8, _val9);
+ _key7 = org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand.findByValue(iprot.readI32());
+ _val8 = iprot.readString();
+ struct.jobManagerCommands.put(_key7, _val8);
}
}
struct.setJobManagerCommandsIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java
index db086fe..83228d2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -47,7 +47,7 @@ import org.apache.thrift.TEnum;
* * IBM Platform Load Sharing Facility is dominantly installed on IBM clusters.
* *
*/
-@SuppressWarnings("all") public enum ResourceJobManagerType implements org.apache.thrift.TEnum {
+public enum ResourceJobManagerType implements org.apache.thrift.TEnum {
FORK(0),
PBS(1),
SLURM(2),
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
index e6cd453..aa5369d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Data Movement through Secured Copy
*
@@ -58,7 +60,8 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@SuppressWarnings("all") public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -78,7 +81,7 @@ import org.slf4j.LoggerFactory;
private int sshPort; // 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"),
/**
*
@@ -151,7 +154,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __SSHPORT_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.ALTERNATIVE_SCPHOST_NAME,_Fields.SSH_PORT};
+ private static final _Fields optionals[] = {_Fields.ALTERNATIVE_SCPHOST_NAME,_Fields.SSH_PORT};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -441,7 +444,29 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId());
+ list.add(present_dataMovementInterfaceId);
+ if (present_dataMovementInterfaceId)
+ list.add(dataMovementInterfaceId);
+
+ boolean present_securityProtocol = true && (isSetSecurityProtocol());
+ list.add(present_securityProtocol);
+ if (present_securityProtocol)
+ list.add(securityProtocol.getValue());
+
+ boolean present_alternativeSCPHostName = true && (isSetAlternativeSCPHostName());
+ list.add(present_alternativeSCPHostName);
+ if (present_alternativeSCPHostName)
+ list.add(alternativeSCPHostName);
+
+ boolean present_sshPort = true && (isSetSshPort());
+ list.add(present_sshPort);
+ if (present_sshPort)
+ list.add(sshPort);
+
+ return list.hashCode();
}
@Override
@@ -606,7 +631,7 @@ import org.slf4j.LoggerFactory;
break;
case 2: // SECURITY_PROTOCOL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -703,7 +728,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.dataMovementInterfaceId = iprot.readString();
struct.setDataMovementInterfaceIdIsSet(true);
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
index 4c19d31..6361ee4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Authenticate using Secured Shell
*
@@ -58,7 +60,8 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@SuppressWarnings("all") public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission");
private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -82,7 +85,7 @@ import org.slf4j.LoggerFactory;
private MonitorMode monitorMode; // 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
/**
*
@@ -165,7 +168,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __SSHPORT_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.ALTERNATIVE_SSHHOST_NAME,_Fields.SSH_PORT,_Fields.MONITOR_MODE};
+ private static final _Fields optionals[] = {_Fields.ALTERNATIVE_SSHHOST_NAME,_Fields.SSH_PORT,_Fields.MONITOR_MODE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -567,7 +570,39 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_jobSubmissionInterfaceId = true && (isSetJobSubmissionInterfaceId());
+ list.add(present_jobSubmissionInterfaceId);
+ if (present_jobSubmissionInterfaceId)
+ list.add(jobSubmissionInterfaceId);
+
+ boolean present_securityProtocol = true && (isSetSecurityProtocol());
+ list.add(present_securityProtocol);
+ if (present_securityProtocol)
+ list.add(securityProtocol.getValue());
+
+ boolean present_resourceJobManager = true && (isSetResourceJobManager());
+ list.add(present_resourceJobManager);
+ if (present_resourceJobManager)
+ list.add(resourceJobManager);
+
+ boolean present_alternativeSSHHostName = true && (isSetAlternativeSSHHostName());
+ list.add(present_alternativeSSHHostName);
+ if (present_alternativeSSHHostName)
+ list.add(alternativeSSHHostName);
+
+ boolean present_sshPort = true && (isSetSshPort());
+ list.add(present_sshPort);
+ if (present_sshPort)
+ list.add(sshPort);
+
+ boolean present_monitorMode = true && (isSetMonitorMode());
+ list.add(present_monitorMode);
+ if (present_monitorMode)
+ list.add(monitorMode.getValue());
+
+ return list.hashCode();
}
@Override
@@ -777,7 +812,7 @@ import org.slf4j.LoggerFactory;
break;
case 2: // SECURITY_PROTOCOL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -810,7 +845,7 @@ import org.slf4j.LoggerFactory;
break;
case 6: // MONITOR_MODE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.monitorMode = MonitorMode.findByValue(iprot.readI32());
+ struct.monitorMode = org.apache.airavata.model.appcatalog.computeresource.MonitorMode.findByValue(iprot.readI32());
struct.setMonitorModeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -910,7 +945,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.jobSubmissionInterfaceId = iprot.readString();
struct.setJobSubmissionInterfaceIdIsSet(true);
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
struct.resourceJobManager = new ResourceJobManager();
struct.resourceJobManager.read(iprot);
@@ -925,7 +960,7 @@ import org.slf4j.LoggerFactory;
struct.setSshPortIsSet(true);
}
if (incoming.get(2)) {
- struct.monitorMode = MonitorMode.findByValue(iprot.readI32());
+ struct.monitorMode = org.apache.airavata.model.appcatalog.computeresource.MonitorMode.findByValue(iprot.readI32());
struct.setMonitorModeIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SecurityProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SecurityProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SecurityProtocol.java
index 1ff1de8..ce43568 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SecurityProtocol.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SecurityProtocol.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -42,7 +42,7 @@ import org.apache.thrift.TEnum;
* FIXME: Change GSI to a more precise generic security protocol - X509
*
*/
-@SuppressWarnings("all") public enum SecurityProtocol implements org.apache.thrift.TEnum {
+public enum SecurityProtocol implements org.apache.thrift.TEnum {
USERNAME_PASSWORD(0),
SSH_KEYS(1),
GSI(2),
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
index 4bac5a0..0cef00a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,16 +46,19 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Data Movement through UnicoreStorage
*
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@SuppressWarnings("all") public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement");
private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -73,7 +76,7 @@ import org.slf4j.LoggerFactory;
private String unicoreEndPointURL; // required
/** 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"),
/**
*
@@ -380,7 +383,24 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_dataMovementInterfaceId = true && (isSetDataMovementInterfaceId());
+ list.add(present_dataMovementInterfaceId);
+ if (present_dataMovementInterfaceId)
+ list.add(dataMovementInterfaceId);
+
+ boolean present_securityProtocol = true && (isSetSecurityProtocol());
+ list.add(present_securityProtocol);
+ if (present_securityProtocol)
+ list.add(securityProtocol.getValue());
+
+ boolean present_unicoreEndPointURL = true && (isSetUnicoreEndPointURL());
+ list.add(present_unicoreEndPointURL);
+ if (present_unicoreEndPointURL)
+ list.add(unicoreEndPointURL);
+
+ return list.hashCode();
}
@Override
@@ -529,7 +549,7 @@ import org.slf4j.LoggerFactory;
break;
case 2: // SECURITY_PROTOCOL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -598,7 +618,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.dataMovementInterfaceId = iprot.readString();
struct.setDataMovementInterfaceIdIsSet(true);
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
struct.unicoreEndPointURL = iprot.readString();
struct.setUnicoreEndPointURLIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
index e1dc2d5..e5cd82b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Unicore Job Submission
*
@@ -57,7 +59,8 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@SuppressWarnings("all") public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission");
private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -75,7 +78,7 @@ import org.slf4j.LoggerFactory;
private String unicoreEndPointURL; // required
/** 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
/**
*
@@ -382,7 +385,24 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_jobSubmissionInterfaceId = true && (isSetJobSubmissionInterfaceId());
+ list.add(present_jobSubmissionInterfaceId);
+ if (present_jobSubmissionInterfaceId)
+ list.add(jobSubmissionInterfaceId);
+
+ boolean present_securityProtocol = true && (isSetSecurityProtocol());
+ list.add(present_securityProtocol);
+ if (present_securityProtocol)
+ list.add(securityProtocol.getValue());
+
+ boolean present_unicoreEndPointURL = true && (isSetUnicoreEndPointURL());
+ list.add(present_unicoreEndPointURL);
+ if (present_unicoreEndPointURL)
+ list.add(unicoreEndPointURL);
+
+ return list.hashCode();
}
@Override
@@ -531,7 +551,7 @@ import org.slf4j.LoggerFactory;
break;
case 2: // SECURITY_PROTOCOL
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -600,7 +620,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.jobSubmissionInterfaceId = iprot.readString();
struct.setJobSubmissionInterfaceIdIsSet(true);
- struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
+ struct.securityProtocol = org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol.findByValue(iprot.readI32());
struct.setSecurityProtocolIsSet(true);
struct.unicoreEndPointURL = iprot.readString();
struct.setUnicoreEndPointURLIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index 1661d3a..9d4268f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Gateway specific preferences for a Computer Resource
*
@@ -79,7 +81,8 @@ import org.slf4j.LoggerFactory;
* account to be used has to be added to the allocation.
*
*/
-@SuppressWarnings("all") public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference");
private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -107,7 +110,7 @@ import org.slf4j.LoggerFactory;
private String allocationProjectNumber; // 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
COMPUTE_RESOURCE_ID((short)1, "computeResourceId"),
OVERRIDEBY_AIRAVATA((short)2, "overridebyAiravata"),
LOGIN_USER_NAME((short)3, "loginUserName"),
@@ -196,7 +199,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __OVERRIDEBYAIRAVATA_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER};
+ private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -696,7 +699,49 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_computeResourceId = true && (isSetComputeResourceId());
+ list.add(present_computeResourceId);
+ if (present_computeResourceId)
+ list.add(computeResourceId);
+
+ boolean present_overridebyAiravata = true;
+ list.add(present_overridebyAiravata);
+ if (present_overridebyAiravata)
+ list.add(overridebyAiravata);
+
+ boolean present_loginUserName = true && (isSetLoginUserName());
+ list.add(present_loginUserName);
+ if (present_loginUserName)
+ list.add(loginUserName);
+
+ boolean present_preferredJobSubmissionProtocol = true && (isSetPreferredJobSubmissionProtocol());
+ list.add(present_preferredJobSubmissionProtocol);
+ if (present_preferredJobSubmissionProtocol)
+ list.add(preferredJobSubmissionProtocol.getValue());
+
+ boolean present_preferredDataMovementProtocol = true && (isSetPreferredDataMovementProtocol());
+ list.add(present_preferredDataMovementProtocol);
+ if (present_preferredDataMovementProtocol)
+ list.add(preferredDataMovementProtocol.getValue());
+
+ boolean present_preferredBatchQueue = true && (isSetPreferredBatchQueue());
+ list.add(present_preferredBatchQueue);
+ if (present_preferredBatchQueue)
+ list.add(preferredBatchQueue);
+
+ boolean present_scratchLocation = true && (isSetScratchLocation());
+ list.add(present_scratchLocation);
+ if (present_scratchLocation)
+ list.add(scratchLocation);
+
+ boolean present_allocationProjectNumber = true && (isSetAllocationProjectNumber());
+ list.add(present_allocationProjectNumber);
+ if (present_allocationProjectNumber)
+ list.add(allocationProjectNumber);
+
+ return list.hashCode();
}
@Override
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
index 1c317eb..515c18d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* Gateway Resource Profile
*
@@ -60,7 +62,8 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@SuppressWarnings("all") public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile");
private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayID", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -76,7 +79,7 @@ import org.slf4j.LoggerFactory;
private List<ComputeResourcePreference> computeResourcePreferences; // 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
GATEWAY_ID((short)1, "gatewayID"),
COMPUTE_RESOURCE_PREFERENCES((short)2, "computeResourcePreferences");
@@ -137,7 +140,7 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private _Fields optionals[] = {_Fields.COMPUTE_RESOURCE_PREFERENCES};
+ private static final _Fields optionals[] = {_Fields.COMPUTE_RESOURCE_PREFERENCES};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -331,7 +334,19 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_gatewayID = true && (isSetGatewayID());
+ list.add(present_gatewayID);
+ if (present_gatewayID)
+ list.add(gatewayID);
+
+ boolean present_computeResourcePreferences = true && (isSetComputeResourcePreferences());
+ list.add(present_computeResourcePreferences);
+ if (present_computeResourcePreferences)
+ list.add(computeResourcePreferences);
+
+ return list.hashCode();
}
@Override
@@ -459,12 +474,12 @@ import org.slf4j.LoggerFactory;
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
struct.computeResourcePreferences = new ArrayList<ComputeResourcePreference>(_list0.size);
- for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+ ComputeResourcePreference _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
{
- ComputeResourcePreference _elem2;
- _elem2 = new ComputeResourcePreference();
- _elem2.read(iprot);
- struct.computeResourcePreferences.add(_elem2);
+ _elem1 = new ComputeResourcePreference();
+ _elem1.read(iprot);
+ struct.computeResourcePreferences.add(_elem1);
}
iprot.readListEnd();
}
@@ -549,12 +564,12 @@ import org.slf4j.LoggerFactory;
{
org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.computeResourcePreferences = new ArrayList<ComputeResourcePreference>(_list5.size);
- for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+ ComputeResourcePreference _elem6;
+ for (int _i7 = 0; _i7 < _list5.size; ++_i7)
{
- ComputeResourcePreference _elem7;
- _elem7 = new ComputeResourcePreference();
- _elem7.read(iprot);
- struct.computeResourcePreferences.add(_elem7);
+ _elem6 = new ComputeResourcePreference();
+ _elem6.read(iprot);
+ struct.computeResourcePreferences.add(_elem6);
}
}
struct.setComputeResourcePreferencesIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
index 1ce089a..b7dba91 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* This exception is thrown by Airavata Services when a call fails as a result of
* a problem that a client may be able to resolve. For example, if the user
@@ -64,7 +66,8 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@SuppressWarnings("all") public class AiravataClientException extends TException implements org.apache.thrift.TBase<AiravataClientException, AiravataClientException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataClientException> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class AiravataClientException extends TException implements org.apache.thrift.TBase<AiravataClientException, AiravataClientException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataClientException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataClientException");
private static final org.apache.thrift.protocol.TField AIRAVATA_ERROR_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataErrorType", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -80,7 +83,7 @@ import org.slf4j.LoggerFactory;
private String parameter; // 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
/**
*
* @see AiravataErrorType
@@ -145,7 +148,7 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private _Fields optionals[] = {_Fields.PARAMETER};
+ private static final _Fields optionals[] = {_Fields.PARAMETER};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -327,7 +330,19 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_airavataErrorType = true && (isSetAiravataErrorType());
+ list.add(present_airavataErrorType);
+ if (present_airavataErrorType)
+ list.add(airavataErrorType.getValue());
+
+ boolean present_parameter = true && (isSetParameter());
+ list.add(present_parameter);
+ if (present_parameter)
+ list.add(parameter);
+
+ return list.hashCode();
}
@Override
@@ -444,7 +459,7 @@ import org.slf4j.LoggerFactory;
switch (schemeField.id) {
case 1: // AIRAVATA_ERROR_TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.airavataErrorType = AiravataErrorType.findByValue(iprot.readI32());
+ struct.airavataErrorType = org.apache.airavata.model.error.AiravataErrorType.findByValue(iprot.readI32());
struct.setAiravataErrorTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -514,7 +529,7 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, AiravataClientException struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.airavataErrorType = AiravataErrorType.findByValue(iprot.readI32());
+ struct.airavataErrorType = org.apache.airavata.model.error.AiravataErrorType.findByValue(iprot.readI32());
struct.setAiravataErrorTypeIsSet(true);
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataErrorType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataErrorType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataErrorType.java
index a1a2c2d..09409f2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataErrorType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataErrorType.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -47,7 +47,7 @@ import org.apache.thrift.TEnum;
*
* UNSUPPORTED_OPERATION: Operation denied because it is currently unsupported.
*/
-@SuppressWarnings("all") public enum AiravataErrorType implements org.apache.thrift.TEnum {
+public enum AiravataErrorType implements org.apache.thrift.TEnum {
UNKNOWN(0),
PERMISSION_DENIED(1),
INTERNAL_ERROR(2),
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
index 20aafed..7d18317 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,9 +46,11 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* This exception is thrown by Airavata Services when a call fails as a result of
* a problem in the service that could not be changed through client's action.
@@ -59,7 +61,8 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@SuppressWarnings("all") public class AiravataSystemException extends TException implements org.apache.thrift.TBase<AiravataSystemException, AiravataSystemException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataSystemException> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class AiravataSystemException extends TException implements org.apache.thrift.TBase<AiravataSystemException, AiravataSystemException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataSystemException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataSystemException");
private static final org.apache.thrift.protocol.TField AIRAVATA_ERROR_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataErrorType", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -75,7 +78,7 @@ import org.slf4j.LoggerFactory;
private String message; // 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
/**
*
* @see AiravataErrorType
@@ -140,7 +143,7 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private _Fields optionals[] = {_Fields.MESSAGE};
+ private static final _Fields optionals[] = {_Fields.MESSAGE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -322,7 +325,19 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_airavataErrorType = true && (isSetAiravataErrorType());
+ list.add(present_airavataErrorType);
+ if (present_airavataErrorType)
+ list.add(airavataErrorType.getValue());
+
+ boolean present_message = true && (isSetMessage());
+ list.add(present_message);
+ if (present_message)
+ list.add(message);
+
+ return list.hashCode();
}
@Override
@@ -439,7 +454,7 @@ import org.slf4j.LoggerFactory;
switch (schemeField.id) {
case 1: // AIRAVATA_ERROR_TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.airavataErrorType = AiravataErrorType.findByValue(iprot.readI32());
+ struct.airavataErrorType = org.apache.airavata.model.error.AiravataErrorType.findByValue(iprot.readI32());
struct.setAiravataErrorTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -509,7 +524,7 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, AiravataSystemException struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.airavataErrorType = AiravataErrorType.findByValue(iprot.readI32());
+ struct.airavataErrorType = org.apache.airavata.model.error.AiravataErrorType.findByValue(iprot.readI32());
struct.setAiravataErrorTypeIsSet(true);
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
index 5db0d18..6c8680f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -16,7 +16,7 @@
*/
/**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -46,15 +46,18 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
* This exception is thrown for invalid authentication requests.
*
* message: contains the cause of the authorization failure.
*/
-@SuppressWarnings("all") public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -68,7 +71,7 @@ import org.slf4j.LoggerFactory;
private String message; // required
/** 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 {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
MESSAGE((short)1, "message");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -248,7 +251,14 @@ import org.slf4j.LoggerFactory;
@Override
public int hashCode() {
- return 0;
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_message = true && (isSetMessage());
+ list.add(present_message);
+ if (present_message)
+ list.add(message);
+
+ return list.hashCode();
}
@Override