Repository: airavata Updated Branches: refs/heads/master 068c18b97 -> a5cb91f0f
http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidationResults.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidationResults.java index daea4e1..fe76ec4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidationResults.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidationResults.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 ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults"); private static final org.apache.thrift.protocol.TField VALIDATION_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("validationState", org.apache.thrift.protocol.TType.BOOL, (short)1); @@ -65,7 +68,7 @@ import org.slf4j.LoggerFactory; private List<ValidatorResult> validationResultList; // 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 { VALIDATION_STATE((short)1, "validationState"), VALIDATION_RESULT_LIST((short)2, "validationResultList"); @@ -323,7 +326,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_validationState = true; + list.add(present_validationState); + if (present_validationState) + list.add(validationState); + + boolean present_validationResultList = true && (isSetValidationResultList()); + list.add(present_validationResultList); + if (present_validationResultList) + list.add(validationResultList); + + return list.hashCode(); } @Override @@ -451,12 +466,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list96 = iprot.readListBegin(); struct.validationResultList = new ArrayList<ValidatorResult>(_list96.size); - for (int _i97 = 0; _i97 < _list96.size; ++_i97) + ValidatorResult _elem97; + for (int _i98 = 0; _i98 < _list96.size; ++_i98) { - ValidatorResult _elem98; - _elem98 = new ValidatorResult(); - _elem98.read(iprot); - struct.validationResultList.add(_elem98); + _elem97 = new ValidatorResult(); + _elem97.read(iprot); + struct.validationResultList.add(_elem97); } iprot.readListEnd(); } @@ -528,12 +543,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list101 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.validationResultList = new ArrayList<ValidatorResult>(_list101.size); - for (int _i102 = 0; _i102 < _list101.size; ++_i102) + ValidatorResult _elem102; + for (int _i103 = 0; _i103 < _list101.size; ++_i103) { - ValidatorResult _elem103; - _elem103 = new ValidatorResult(); - _elem103.read(iprot); - struct.validationResultList.add(_elem103); + _elem102 = new ValidatorResult(); + _elem102.read(iprot); + struct.validationResultList.add(_elem102); } } struct.setValidationResultListIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidatorResult.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidatorResult.java index 8fdf648..9655c4a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidatorResult.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ValidatorResult.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 data structure can be used to store the validation results * captured during validation step and during the launchExperiment @@ -56,7 +58,8 @@ import org.slf4j.LoggerFactory; * during the experiment launch operation * */ -@SuppressWarnings("all") public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult"); private static final org.apache.thrift.protocol.TField RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("result", org.apache.thrift.protocol.TType.BOOL, (short)1); @@ -72,7 +75,7 @@ import org.slf4j.LoggerFactory; private String errorDetails; // 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 { RESULT((short)1, "result"), ERROR_DETAILS((short)2, "errorDetails"); @@ -135,7 +138,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __RESULT_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.ERROR_DETAILS}; + private static final _Fields optionals[] = {_Fields.ERROR_DETAILS}; 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); @@ -309,7 +312,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_result = true; + list.add(present_result); + if (present_result) + list.add(result); + + boolean present_errorDetails = true && (isSetErrorDetails()); + list.add(present_errorDetails); + if (present_errorDetails) + list.add(errorDetails); + + 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/workspace/experiment/WorkflowNodeDetails.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeDetails.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeDetails.java index c02d97b..2bc47a1 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeDetails.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeDetails.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,14 +46,17 @@ 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"}) /** * A structure holding the node data. * nodeInstanceId - unique node identifier for each run */ -@SuppressWarnings("all") public class WorkflowNodeDetails implements org.apache.thrift.TBase<WorkflowNodeDetails, WorkflowNodeDetails._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowNodeDetails> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class WorkflowNodeDetails implements org.apache.thrift.TBase<WorkflowNodeDetails, WorkflowNodeDetails._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowNodeDetails> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowNodeDetails"); private static final org.apache.thrift.protocol.TField NODE_INSTANCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("nodeInstanceId", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -85,7 +88,7 @@ import org.slf4j.LoggerFactory; private List<ErrorDetails> errors; // 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 { NODE_INSTANCE_ID((short)1, "nodeInstanceId"), CREATION_TIME((short)2, "creationTime"), NODE_NAME((short)3, "nodeName"), @@ -176,7 +179,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __CREATIONTIME_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.EXECUTION_UNIT_DATA,_Fields.NODE_INPUTS,_Fields.NODE_OUTPUTS,_Fields.WORKFLOW_NODE_STATUS,_Fields.TASK_DETAILS_LIST,_Fields.ERRORS}; + private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.EXECUTION_UNIT_DATA,_Fields.NODE_INPUTS,_Fields.NODE_OUTPUTS,_Fields.WORKFLOW_NODE_STATUS,_Fields.TASK_DETAILS_LIST,_Fields.ERRORS}; 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); @@ -858,7 +861,59 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_nodeInstanceId = true && (isSetNodeInstanceId()); + list.add(present_nodeInstanceId); + if (present_nodeInstanceId) + list.add(nodeInstanceId); + + boolean present_creationTime = true && (isSetCreationTime()); + list.add(present_creationTime); + if (present_creationTime) + list.add(creationTime); + + boolean present_nodeName = true && (isSetNodeName()); + list.add(present_nodeName); + if (present_nodeName) + list.add(nodeName); + + boolean present_executionUnit = true && (isSetExecutionUnit()); + list.add(present_executionUnit); + if (present_executionUnit) + list.add(executionUnit.getValue()); + + boolean present_executionUnitData = true && (isSetExecutionUnitData()); + list.add(present_executionUnitData); + if (present_executionUnitData) + list.add(executionUnitData); + + boolean present_nodeInputs = true && (isSetNodeInputs()); + list.add(present_nodeInputs); + if (present_nodeInputs) + list.add(nodeInputs); + + boolean present_nodeOutputs = true && (isSetNodeOutputs()); + list.add(present_nodeOutputs); + if (present_nodeOutputs) + list.add(nodeOutputs); + + boolean present_workflowNodeStatus = true && (isSetWorkflowNodeStatus()); + list.add(present_workflowNodeStatus); + if (present_workflowNodeStatus) + list.add(workflowNodeStatus); + + boolean present_taskDetailsList = true && (isSetTaskDetailsList()); + list.add(present_taskDetailsList); + if (present_taskDetailsList) + list.add(taskDetailsList); + + boolean present_errors = true && (isSetErrors()); + list.add(present_errors); + if (present_errors) + list.add(errors); + + return list.hashCode(); } @Override @@ -1164,7 +1219,7 @@ import org.slf4j.LoggerFactory; break; case 4: // EXECUTION_UNIT if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.executionUnit = ExecutionUnit.findByValue(iprot.readI32()); + struct.executionUnit = org.apache.airavata.model.workspace.experiment.ExecutionUnit.findByValue(iprot.readI32()); struct.setExecutionUnitIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1183,12 +1238,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list64 = iprot.readListBegin(); struct.nodeInputs = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType>(_list64.size); - for (int _i65 = 0; _i65 < _list64.size; ++_i65) + org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType _elem65; + for (int _i66 = 0; _i66 < _list64.size; ++_i66) { - org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType _elem66; - _elem66 = new org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType(); - _elem66.read(iprot); - struct.nodeInputs.add(_elem66); + _elem65 = new org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType(); + _elem65.read(iprot); + struct.nodeInputs.add(_elem65); } iprot.readListEnd(); } @@ -1202,12 +1257,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list67 = iprot.readListBegin(); struct.nodeOutputs = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>(_list67.size); - for (int _i68 = 0; _i68 < _list67.size; ++_i68) + org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem68; + for (int _i69 = 0; _i69 < _list67.size; ++_i69) { - org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem69; - _elem69 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(); - _elem69.read(iprot); - struct.nodeOutputs.add(_elem69); + _elem68 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(); + _elem68.read(iprot); + struct.nodeOutputs.add(_elem68); } iprot.readListEnd(); } @@ -1230,12 +1285,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list70 = iprot.readListBegin(); struct.taskDetailsList = new ArrayList<TaskDetails>(_list70.size); - for (int _i71 = 0; _i71 < _list70.size; ++_i71) + TaskDetails _elem71; + for (int _i72 = 0; _i72 < _list70.size; ++_i72) { - TaskDetails _elem72; - _elem72 = new TaskDetails(); - _elem72.read(iprot); - struct.taskDetailsList.add(_elem72); + _elem71 = new TaskDetails(); + _elem71.read(iprot); + struct.taskDetailsList.add(_elem71); } iprot.readListEnd(); } @@ -1249,12 +1304,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list73 = iprot.readListBegin(); struct.errors = new ArrayList<ErrorDetails>(_list73.size); - for (int _i74 = 0; _i74 < _list73.size; ++_i74) + ErrorDetails _elem74; + for (int _i75 = 0; _i75 < _list73.size; ++_i75) { - ErrorDetails _elem75; - _elem75 = new ErrorDetails(); - _elem75.read(iprot); - struct.errors.add(_elem75); + _elem74 = new ErrorDetails(); + _elem74.read(iprot); + struct.errors.add(_elem74); } iprot.readListEnd(); } @@ -1463,7 +1518,7 @@ import org.slf4j.LoggerFactory; struct.setNodeInstanceIdIsSet(true); struct.nodeName = iprot.readString(); struct.setNodeNameIsSet(true); - struct.executionUnit = ExecutionUnit.findByValue(iprot.readI32()); + struct.executionUnit = org.apache.airavata.model.workspace.experiment.ExecutionUnit.findByValue(iprot.readI32()); struct.setExecutionUnitIsSet(true); BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { @@ -1478,12 +1533,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list84 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.nodeInputs = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType>(_list84.size); - for (int _i85 = 0; _i85 < _list84.size; ++_i85) + org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType _elem85; + for (int _i86 = 0; _i86 < _list84.size; ++_i86) { - org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType _elem86; - _elem86 = new org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType(); - _elem86.read(iprot); - struct.nodeInputs.add(_elem86); + _elem85 = new org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType(); + _elem85.read(iprot); + struct.nodeInputs.add(_elem85); } } struct.setNodeInputsIsSet(true); @@ -1492,12 +1547,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list87 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.nodeOutputs = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>(_list87.size); - for (int _i88 = 0; _i88 < _list87.size; ++_i88) + org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem88; + for (int _i89 = 0; _i89 < _list87.size; ++_i89) { - org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem89; - _elem89 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(); - _elem89.read(iprot); - struct.nodeOutputs.add(_elem89); + _elem88 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(); + _elem88.read(iprot); + struct.nodeOutputs.add(_elem88); } } struct.setNodeOutputsIsSet(true); @@ -1511,12 +1566,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list90 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.taskDetailsList = new ArrayList<TaskDetails>(_list90.size); - for (int _i91 = 0; _i91 < _list90.size; ++_i91) + TaskDetails _elem91; + for (int _i92 = 0; _i92 < _list90.size; ++_i92) { - TaskDetails _elem92; - _elem92 = new TaskDetails(); - _elem92.read(iprot); - struct.taskDetailsList.add(_elem92); + _elem91 = new TaskDetails(); + _elem91.read(iprot); + struct.taskDetailsList.add(_elem91); } } struct.setTaskDetailsListIsSet(true); @@ -1525,12 +1580,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list93 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.errors = new ArrayList<ErrorDetails>(_list93.size); - for (int _i94 = 0; _i94 < _list93.size; ++_i94) + ErrorDetails _elem94; + for (int _i95 = 0; _i95 < _list93.size; ++_i95) { - ErrorDetails _elem95; - _elem95 = new ErrorDetails(); - _elem95.read(iprot); - struct.errors.add(_elem95); + _elem94 = new ErrorDetails(); + _elem94.read(iprot); + struct.errors.add(_elem94); } } struct.setErrorsIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java index bfd5d7f..88182e2 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.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 @@ -28,7 +28,7 @@ import java.util.Map; import java.util.HashMap; import org.apache.thrift.TEnum; -@SuppressWarnings("all") public enum WorkflowNodeState implements org.apache.thrift.TEnum { +public enum WorkflowNodeState implements org.apache.thrift.TEnum { INVOKED(0), EXECUTING(1), CANCELING(2), http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.java index e171043..ed7a3e2 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeStatus.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 WorkflowNodeStatus implements org.apache.thrift.TBase<WorkflowNodeStatus, WorkflowNodeStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowNodeStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class WorkflowNodeStatus implements org.apache.thrift.TBase<WorkflowNodeStatus, WorkflowNodeStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowNodeStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowNodeStatus"); private static final org.apache.thrift.protocol.TField WORKFLOW_NODE_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowNodeState", org.apache.thrift.protocol.TType.I32, (short)1); @@ -65,7 +68,7 @@ import org.slf4j.LoggerFactory; private long timeOfStateChange; // 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 WorkflowNodeState @@ -132,7 +135,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __TIMEOFSTATECHANGE_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; + private static final _Fields optionals[] = {_Fields.TIME_OF_STATE_CHANGE}; 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); @@ -313,7 +316,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_workflowNodeState = true && (isSetWorkflowNodeState()); + list.add(present_workflowNodeState); + if (present_workflowNodeState) + list.add(workflowNodeState.getValue()); + + boolean present_timeOfStateChange = true && (isSetTimeOfStateChange()); + list.add(present_timeOfStateChange); + if (present_timeOfStateChange) + list.add(timeOfStateChange); + + return list.hashCode(); } @Override @@ -428,7 +443,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // WORKFLOW_NODE_STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.workflowNodeState = WorkflowNodeState.findByValue(iprot.readI32()); + struct.workflowNodeState = org.apache.airavata.model.workspace.experiment.WorkflowNodeState.findByValue(iprot.readI32()); struct.setWorkflowNodeStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -496,7 +511,7 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, WorkflowNodeStatus struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.workflowNodeState = WorkflowNodeState.findByValue(iprot.readI32()); + struct.workflowNodeState = org.apache.airavata.model.workspace.experiment.WorkflowNodeState.findByValue(iprot.readI32()); struct.setWorkflowNodeStateIsSet(true); BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index c1dbfc3..8c94c71 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -513,7 +513,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.9.1</version> + <version>${thrift.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh ---------------------------------------------------------------------- diff --git a/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh b/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh index 308cc1b..3cb4afe 100755 --- a/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh +++ b/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh @@ -116,7 +116,7 @@ JAVA_GEN_DIR=${BASE_TARGET_DIR}/gen-java rm -rf ${JAVA_GEN_DIR} # Using thrift Java generator, generate the java classes based on Airavata API. This -# The airavata-api.thrift includes rest of data models. +# The airavata_api.thrift includes rest of data models. thrift ${THRIFT_ARGS} --gen java credentialStoreCPI.thrift || fail unable to generate java thrift classes thrift ${THRIFT_ARGS} --gen java credentialStoreDataModel.thrift || fail unable to generate java thrift classes http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3c8bb29..c95d00c 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ <bouncy.castle.version>1.50</bouncy.castle.version> <jglobus.version>2.1.0</jglobus.version> <ebay.cors.filter>1.0.0</ebay.cors.filter> - <thrift.version>0.9.1</thrift.version> + <thrift.version>0.9.2</thrift.version> <mysql.connector.version>5.1.34</mysql.connector.version> <skipTests>false</skipTests> <google.gson.version>2.3</google.gson.version>
