http://git-wip-us.apache.org/repos/asf/airavata/blob/a5cb91f0/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java index 06b6240..022d80a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.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"}) /** * Application Deployment Description * @@ -75,7 +77,8 @@ import org.slf4j.LoggerFactory; * assigns to the environment variable "NAME" the value * */ -@SuppressWarnings("all") public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription"); private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -111,7 +114,7 @@ import org.slf4j.LoggerFactory; private List<String> postJobCommands; // 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 { APP_DEPLOYMENT_ID((short)1, "appDeploymentId"), APP_MODULE_ID((short)2, "appModuleId"), COMPUTE_HOST_ID((short)3, "computeHostId"), @@ -206,7 +209,7 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private _Fields optionals[] = {_Fields.APP_DEPLOYMENT_DESCRIPTION,_Fields.MODULE_LOAD_CMDS,_Fields.LIB_PREPEND_PATHS,_Fields.LIB_APPEND_PATHS,_Fields.SET_ENVIRONMENT,_Fields.PRE_JOB_COMMANDS,_Fields.POST_JOB_COMMANDS}; + private static final _Fields optionals[] = {_Fields.APP_DEPLOYMENT_DESCRIPTION,_Fields.MODULE_LOAD_CMDS,_Fields.LIB_PREPEND_PATHS,_Fields.LIB_APPEND_PATHS,_Fields.SET_ENVIRONMENT,_Fields.PRE_JOB_COMMANDS,_Fields.POST_JOB_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); @@ -1023,7 +1026,69 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_appDeploymentId = true && (isSetAppDeploymentId()); + list.add(present_appDeploymentId); + if (present_appDeploymentId) + list.add(appDeploymentId); + + boolean present_appModuleId = true && (isSetAppModuleId()); + list.add(present_appModuleId); + if (present_appModuleId) + list.add(appModuleId); + + boolean present_computeHostId = true && (isSetComputeHostId()); + list.add(present_computeHostId); + if (present_computeHostId) + list.add(computeHostId); + + boolean present_executablePath = true && (isSetExecutablePath()); + list.add(present_executablePath); + if (present_executablePath) + list.add(executablePath); + + boolean present_parallelism = true && (isSetParallelism()); + list.add(present_parallelism); + if (present_parallelism) + list.add(parallelism.getValue()); + + boolean present_appDeploymentDescription = true && (isSetAppDeploymentDescription()); + list.add(present_appDeploymentDescription); + if (present_appDeploymentDescription) + list.add(appDeploymentDescription); + + boolean present_moduleLoadCmds = true && (isSetModuleLoadCmds()); + list.add(present_moduleLoadCmds); + if (present_moduleLoadCmds) + list.add(moduleLoadCmds); + + boolean present_libPrependPaths = true && (isSetLibPrependPaths()); + list.add(present_libPrependPaths); + if (present_libPrependPaths) + list.add(libPrependPaths); + + boolean present_libAppendPaths = true && (isSetLibAppendPaths()); + list.add(present_libAppendPaths); + if (present_libAppendPaths) + list.add(libAppendPaths); + + boolean present_setEnvironment = true && (isSetSetEnvironment()); + list.add(present_setEnvironment); + if (present_setEnvironment) + list.add(setEnvironment); + + boolean present_preJobCommands = true && (isSetPreJobCommands()); + list.add(present_preJobCommands); + if (present_preJobCommands) + list.add(preJobCommands); + + boolean present_postJobCommands = true && (isSetPostJobCommands()); + list.add(present_postJobCommands); + if (present_postJobCommands) + list.add(postJobCommands); + + return list.hashCode(); } @Override @@ -1380,7 +1445,7 @@ import org.slf4j.LoggerFactory; break; case 5: // PARALLELISM if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.parallelism = ApplicationParallelismType.findByValue(iprot.readI32()); + struct.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.findByValue(iprot.readI32()); struct.setParallelismIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1399,11 +1464,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); struct.moduleLoadCmds = new ArrayList<String>(_list0.size); - for (int _i1 = 0; _i1 < _list0.size; ++_i1) + String _elem1; + for (int _i2 = 0; _i2 < _list0.size; ++_i2) { - String _elem2; - _elem2 = iprot.readString(); - struct.moduleLoadCmds.add(_elem2); + _elem1 = iprot.readString(); + struct.moduleLoadCmds.add(_elem1); } iprot.readListEnd(); } @@ -1417,12 +1482,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list3 = iprot.readListBegin(); struct.libPrependPaths = new ArrayList<SetEnvPaths>(_list3.size); - for (int _i4 = 0; _i4 < _list3.size; ++_i4) + SetEnvPaths _elem4; + for (int _i5 = 0; _i5 < _list3.size; ++_i5) { - SetEnvPaths _elem5; - _elem5 = new SetEnvPaths(); - _elem5.read(iprot); - struct.libPrependPaths.add(_elem5); + _elem4 = new SetEnvPaths(); + _elem4.read(iprot); + struct.libPrependPaths.add(_elem4); } iprot.readListEnd(); } @@ -1436,12 +1501,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list6 = iprot.readListBegin(); struct.libAppendPaths = new ArrayList<SetEnvPaths>(_list6.size); - for (int _i7 = 0; _i7 < _list6.size; ++_i7) + SetEnvPaths _elem7; + for (int _i8 = 0; _i8 < _list6.size; ++_i8) { - SetEnvPaths _elem8; - _elem8 = new SetEnvPaths(); - _elem8.read(iprot); - struct.libAppendPaths.add(_elem8); + _elem7 = new SetEnvPaths(); + _elem7.read(iprot); + struct.libAppendPaths.add(_elem7); } iprot.readListEnd(); } @@ -1455,12 +1520,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list9 = iprot.readListBegin(); struct.setEnvironment = new ArrayList<SetEnvPaths>(_list9.size); - for (int _i10 = 0; _i10 < _list9.size; ++_i10) + SetEnvPaths _elem10; + for (int _i11 = 0; _i11 < _list9.size; ++_i11) { - SetEnvPaths _elem11; - _elem11 = new SetEnvPaths(); - _elem11.read(iprot); - struct.setEnvironment.add(_elem11); + _elem10 = new SetEnvPaths(); + _elem10.read(iprot); + struct.setEnvironment.add(_elem10); } iprot.readListEnd(); } @@ -1474,11 +1539,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list12 = iprot.readListBegin(); struct.preJobCommands = new ArrayList<String>(_list12.size); - for (int _i13 = 0; _i13 < _list12.size; ++_i13) + String _elem13; + for (int _i14 = 0; _i14 < _list12.size; ++_i14) { - String _elem14; - _elem14 = iprot.readString(); - struct.preJobCommands.add(_elem14); + _elem13 = iprot.readString(); + struct.preJobCommands.add(_elem13); } iprot.readListEnd(); } @@ -1492,11 +1557,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list15 = iprot.readListBegin(); struct.postJobCommands = 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.postJobCommands.add(_elem17); + _elem16 = iprot.readString(); + struct.postJobCommands.add(_elem16); } iprot.readListEnd(); } @@ -1749,7 +1814,7 @@ import org.slf4j.LoggerFactory; struct.setComputeHostIdIsSet(true); struct.executablePath = iprot.readString(); struct.setExecutablePathIsSet(true); - struct.parallelism = ApplicationParallelismType.findByValue(iprot.readI32()); + struct.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.findByValue(iprot.readI32()); struct.setParallelismIsSet(true); BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { @@ -1760,11 +1825,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list30 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.moduleLoadCmds = new ArrayList<String>(_list30.size); - for (int _i31 = 0; _i31 < _list30.size; ++_i31) + String _elem31; + for (int _i32 = 0; _i32 < _list30.size; ++_i32) { - String _elem32; - _elem32 = iprot.readString(); - struct.moduleLoadCmds.add(_elem32); + _elem31 = iprot.readString(); + struct.moduleLoadCmds.add(_elem31); } } struct.setModuleLoadCmdsIsSet(true); @@ -1773,12 +1838,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.libPrependPaths = new ArrayList<SetEnvPaths>(_list33.size); - for (int _i34 = 0; _i34 < _list33.size; ++_i34) + SetEnvPaths _elem34; + for (int _i35 = 0; _i35 < _list33.size; ++_i35) { - SetEnvPaths _elem35; - _elem35 = new SetEnvPaths(); - _elem35.read(iprot); - struct.libPrependPaths.add(_elem35); + _elem34 = new SetEnvPaths(); + _elem34.read(iprot); + struct.libPrependPaths.add(_elem34); } } struct.setLibPrependPathsIsSet(true); @@ -1787,12 +1852,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list36 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.libAppendPaths = new ArrayList<SetEnvPaths>(_list36.size); - for (int _i37 = 0; _i37 < _list36.size; ++_i37) + SetEnvPaths _elem37; + for (int _i38 = 0; _i38 < _list36.size; ++_i38) { - SetEnvPaths _elem38; - _elem38 = new SetEnvPaths(); - _elem38.read(iprot); - struct.libAppendPaths.add(_elem38); + _elem37 = new SetEnvPaths(); + _elem37.read(iprot); + struct.libAppendPaths.add(_elem37); } } struct.setLibAppendPathsIsSet(true); @@ -1801,12 +1866,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list39 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.setEnvironment = new ArrayList<SetEnvPaths>(_list39.size); - for (int _i40 = 0; _i40 < _list39.size; ++_i40) + SetEnvPaths _elem40; + for (int _i41 = 0; _i41 < _list39.size; ++_i41) { - SetEnvPaths _elem41; - _elem41 = new SetEnvPaths(); - _elem41.read(iprot); - struct.setEnvironment.add(_elem41); + _elem40 = new SetEnvPaths(); + _elem40.read(iprot); + struct.setEnvironment.add(_elem40); } } struct.setSetEnvironmentIsSet(true); @@ -1815,11 +1880,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list42 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.preJobCommands = new ArrayList<String>(_list42.size); - for (int _i43 = 0; _i43 < _list42.size; ++_i43) + String _elem43; + for (int _i44 = 0; _i44 < _list42.size; ++_i44) { - String _elem44; - _elem44 = iprot.readString(); - struct.preJobCommands.add(_elem44); + _elem43 = iprot.readString(); + struct.preJobCommands.add(_elem43); } } struct.setPreJobCommandsIsSet(true); @@ -1828,11 +1893,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.postJobCommands = new ArrayList<String>(_list45.size); - for (int _i46 = 0; _i46 < _list45.size; ++_i46) + String _elem46; + for (int _i47 = 0; _i47 < _list45.size; ++_i47) { - String _elem47; - _elem47 = iprot.readString(); - struct.postJobCommands.add(_elem47); + _elem46 = iprot.readString(); + struct.postJobCommands.add(_elem46); } } struct.setPostJobCommandsIsSet(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/appdeployment/ApplicationModule.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java index 6410a0f..0b19fba 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.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"}) /** * Application Module Information. A module has to be registered before registering a deployment. * @@ -64,7 +66,8 @@ import org.slf4j.LoggerFactory; * Descriprion of the Module * */ -@SuppressWarnings("all") public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule"); private static final org.apache.thrift.protocol.TField APP_MODULE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleId", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -84,7 +87,7 @@ import org.slf4j.LoggerFactory; private String appModuleDescription; // 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 { APP_MODULE_ID((short)1, "appModuleId"), APP_MODULE_NAME((short)2, "appModuleName"), APP_MODULE_VERSION((short)3, "appModuleVersion"), @@ -151,7 +154,7 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private _Fields optionals[] = {_Fields.APP_MODULE_VERSION,_Fields.APP_MODULE_DESCRIPTION}; + private static final _Fields optionals[] = {_Fields.APP_MODULE_VERSION,_Fields.APP_MODULE_DESCRIPTION}; 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); @@ -432,7 +435,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_appModuleId = true && (isSetAppModuleId()); + list.add(present_appModuleId); + if (present_appModuleId) + list.add(appModuleId); + + boolean present_appModuleName = true && (isSetAppModuleName()); + list.add(present_appModuleName); + if (present_appModuleName) + list.add(appModuleName); + + boolean present_appModuleVersion = true && (isSetAppModuleVersion()); + list.add(present_appModuleVersion); + if (present_appModuleVersion) + list.add(appModuleVersion); + + boolean present_appModuleDescription = true && (isSetAppModuleDescription()); + list.add(present_appModuleDescription); + if (present_appModuleDescription) + list.add(appModuleDescription); + + 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/appdeployment/ApplicationParallelismType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java index 98a1c0f..5ed2eed 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.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 @@ -44,7 +44,7 @@ import org.apache.thrift.TEnum; * Hybrid Applications. * */ -@SuppressWarnings("all") public enum ApplicationParallelismType implements org.apache.thrift.TEnum { +public enum ApplicationParallelismType implements org.apache.thrift.TEnum { SERIAL(0), MPI(1), OPENMP(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/appdeployment/SetEnvPaths.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java index 48a61bc..8af9964 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.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"}) /** * Key Value pairs to be used to set environments * @@ -58,7 +60,8 @@ import org.slf4j.LoggerFactory; * value: * Value of the environment variable to set */ -@SuppressWarnings("all") public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths"); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -74,7 +77,7 @@ import org.slf4j.LoggerFactory; private String value; // 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 { NAME((short)1, "name"), VALUE((short)2, "value"); @@ -310,7 +313,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_name = true && (isSetName()); + list.add(present_name); + if (present_name) + list.add(name); + + boolean present_value = true && (isSetValue()); + list.add(present_value); + if (present_value) + list.add(value); + + 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/appinterface/ApplicationInterfaceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java index 8fa5a7e..0950a38 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.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"}) /** * Application Interface Description * @@ -62,7 +64,8 @@ import org.slf4j.LoggerFactory; * Outputs generated from the application * */ -@SuppressWarnings("all") public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription"); private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -86,7 +89,7 @@ import org.slf4j.LoggerFactory; private List<OutputDataObjectType> applicationOutputs; // 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 { APPLICATION_INTERFACE_ID((short)1, "applicationInterfaceId"), APPLICATION_NAME((short)2, "applicationName"), APPLICATION_DESCRIPTION((short)3, "applicationDescription"), @@ -159,7 +162,7 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private _Fields optionals[] = {_Fields.APPLICATION_DESCRIPTION,_Fields.APPLICATION_MODULES,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS}; + private static final _Fields optionals[] = {_Fields.APPLICATION_DESCRIPTION,_Fields.APPLICATION_MODULES,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS}; 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); @@ -599,7 +602,39 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_applicationInterfaceId = true && (isSetApplicationInterfaceId()); + list.add(present_applicationInterfaceId); + if (present_applicationInterfaceId) + list.add(applicationInterfaceId); + + boolean present_applicationName = true && (isSetApplicationName()); + list.add(present_applicationName); + if (present_applicationName) + list.add(applicationName); + + boolean present_applicationDescription = true && (isSetApplicationDescription()); + list.add(present_applicationDescription); + if (present_applicationDescription) + list.add(applicationDescription); + + boolean present_applicationModules = true && (isSetApplicationModules()); + list.add(present_applicationModules); + if (present_applicationModules) + list.add(applicationModules); + + boolean present_applicationInputs = true && (isSetApplicationInputs()); + list.add(present_applicationInputs); + if (present_applicationInputs) + list.add(applicationInputs); + + boolean present_applicationOutputs = true && (isSetApplicationOutputs()); + list.add(present_applicationOutputs); + if (present_applicationOutputs) + list.add(applicationOutputs); + + return list.hashCode(); } @Override @@ -825,11 +860,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); struct.applicationModules = new ArrayList<String>(_list0.size); - for (int _i1 = 0; _i1 < _list0.size; ++_i1) + String _elem1; + for (int _i2 = 0; _i2 < _list0.size; ++_i2) { - String _elem2; - _elem2 = iprot.readString(); - struct.applicationModules.add(_elem2); + _elem1 = iprot.readString(); + struct.applicationModules.add(_elem1); } iprot.readListEnd(); } @@ -843,12 +878,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list3 = iprot.readListBegin(); struct.applicationInputs = new ArrayList<InputDataObjectType>(_list3.size); - for (int _i4 = 0; _i4 < _list3.size; ++_i4) + InputDataObjectType _elem4; + for (int _i5 = 0; _i5 < _list3.size; ++_i5) { - InputDataObjectType _elem5; - _elem5 = new InputDataObjectType(); - _elem5.read(iprot); - struct.applicationInputs.add(_elem5); + _elem4 = new InputDataObjectType(); + _elem4.read(iprot); + struct.applicationInputs.add(_elem4); } iprot.readListEnd(); } @@ -862,12 +897,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list6 = iprot.readListBegin(); struct.applicationOutputs = new ArrayList<OutputDataObjectType>(_list6.size); - for (int _i7 = 0; _i7 < _list6.size; ++_i7) + OutputDataObjectType _elem7; + for (int _i8 = 0; _i8 < _list6.size; ++_i8) { - OutputDataObjectType _elem8; - _elem8 = new OutputDataObjectType(); - _elem8.read(iprot); - struct.applicationOutputs.add(_elem8); + _elem7 = new OutputDataObjectType(); + _elem7.read(iprot); + struct.applicationOutputs.add(_elem7); } iprot.readListEnd(); } @@ -1029,11 +1064,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.applicationModules = 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.applicationModules.add(_elem17); + _elem16 = iprot.readString(); + struct.applicationModules.add(_elem16); } } struct.setApplicationModulesIsSet(true); @@ -1042,12 +1077,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.applicationInputs = new ArrayList<InputDataObjectType>(_list18.size); - for (int _i19 = 0; _i19 < _list18.size; ++_i19) + InputDataObjectType _elem19; + for (int _i20 = 0; _i20 < _list18.size; ++_i20) { - InputDataObjectType _elem20; - _elem20 = new InputDataObjectType(); - _elem20.read(iprot); - struct.applicationInputs.add(_elem20); + _elem19 = new InputDataObjectType(); + _elem19.read(iprot); + struct.applicationInputs.add(_elem19); } } struct.setApplicationInputsIsSet(true); @@ -1056,12 +1091,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.applicationOutputs = new ArrayList<OutputDataObjectType>(_list21.size); - for (int _i22 = 0; _i22 < _list21.size; ++_i22) + OutputDataObjectType _elem22; + for (int _i23 = 0; _i23 < _list21.size; ++_i23) { - OutputDataObjectType _elem23; - _elem23 = new OutputDataObjectType(); - _elem23.read(iprot); - struct.applicationOutputs.add(_elem23); + _elem22 = new OutputDataObjectType(); + _elem22.read(iprot); + struct.applicationOutputs.add(_elem22); } } struct.setApplicationOutputsIsSet(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/appinterface/DataType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.java index dc14aac..9a502c9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/DataType.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; * Data Types supported in Airavata. The primitive data types * */ -@SuppressWarnings("all") public enum DataType implements org.apache.thrift.TEnum { +public enum DataType implements org.apache.thrift.TEnum { STRING(0), INTEGER(1), FLOAT(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/appinterface/InputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java index eb7bf3f..75e699b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.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"}) /** * Application Inputs. The paramters describe how inputs are passed to the application. * @@ -75,7 +77,8 @@ import org.slf4j.LoggerFactory; * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. * */ -@SuppressWarnings("all") public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType"); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -109,7 +112,7 @@ import org.slf4j.LoggerFactory; private boolean dataStaged; // 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 { NAME((short)1, "name"), VALUE((short)2, "value"), /** @@ -207,7 +210,7 @@ import org.slf4j.LoggerFactory; private static final int __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID = 3; private static final int __DATASTAGED_ISSET_ID = 4; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA,_Fields.INPUT_ORDER,_Fields.IS_REQUIRED,_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE,_Fields.DATA_STAGED}; + private static final _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA,_Fields.INPUT_ORDER,_Fields.IS_REQUIRED,_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE,_Fields.DATA_STAGED}; 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); @@ -843,7 +846,64 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_name = true && (isSetName()); + list.add(present_name); + if (present_name) + list.add(name); + + boolean present_value = true && (isSetValue()); + list.add(present_value); + if (present_value) + list.add(value); + + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type.getValue()); + + boolean present_applicationArgument = true && (isSetApplicationArgument()); + list.add(present_applicationArgument); + if (present_applicationArgument) + list.add(applicationArgument); + + boolean present_standardInput = true && (isSetStandardInput()); + list.add(present_standardInput); + if (present_standardInput) + list.add(standardInput); + + boolean present_userFriendlyDescription = true && (isSetUserFriendlyDescription()); + list.add(present_userFriendlyDescription); + if (present_userFriendlyDescription) + list.add(userFriendlyDescription); + + boolean present_metaData = true && (isSetMetaData()); + list.add(present_metaData); + if (present_metaData) + list.add(metaData); + + boolean present_inputOrder = true && (isSetInputOrder()); + list.add(present_inputOrder); + if (present_inputOrder) + list.add(inputOrder); + + boolean present_isRequired = true && (isSetIsRequired()); + list.add(present_isRequired); + if (present_isRequired) + list.add(isRequired); + + boolean present_requiredToAddedToCommandLine = true && (isSetRequiredToAddedToCommandLine()); + list.add(present_requiredToAddedToCommandLine); + if (present_requiredToAddedToCommandLine) + list.add(requiredToAddedToCommandLine); + + boolean present_dataStaged = true && (isSetDataStaged()); + list.add(present_dataStaged); + if (present_dataStaged) + list.add(dataStaged); + + return list.hashCode(); } @Override @@ -1138,7 +1198,7 @@ import org.slf4j.LoggerFactory; break; case 3: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = DataType.findByValue(iprot.readI32()); + struct.type = org.apache.airavata.model.appcatalog.appinterface.DataType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1379,7 +1439,7 @@ import org.slf4j.LoggerFactory; struct.setValueIsSet(true); } if (incoming.get(1)) { - struct.type = DataType.findByValue(iprot.readI32()); + struct.type = org.apache.airavata.model.appcatalog.appinterface.DataType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } if (incoming.get(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/appinterface/OutputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java index 3f13e52..849c49d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.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"}) /** * Application Outputs. The paramters describe how outputs generated by the application. * @@ -75,7 +77,8 @@ import org.slf4j.LoggerFactory; * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. * */ -@SuppressWarnings("all") public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType"); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -105,7 +108,7 @@ import org.slf4j.LoggerFactory; private String searchQuery; // 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 { NAME((short)1, "name"), VALUE((short)2, "value"), /** @@ -195,7 +198,7 @@ import org.slf4j.LoggerFactory; private static final int __REQUIREDTOADDEDTOCOMMANDLINE_ISSET_ID = 1; private static final int __DATAMOVEMENT_ISSET_ID = 2; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.IS_REQUIRED,_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE,_Fields.DATA_MOVEMENT,_Fields.LOCATION,_Fields.SEARCH_QUERY}; + private static final _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.IS_REQUIRED,_Fields.REQUIRED_TO_ADDED_TO_COMMAND_LINE,_Fields.DATA_MOVEMENT,_Fields.LOCATION,_Fields.SEARCH_QUERY}; 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); @@ -729,7 +732,54 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_name = true && (isSetName()); + list.add(present_name); + if (present_name) + list.add(name); + + boolean present_value = true && (isSetValue()); + list.add(present_value); + if (present_value) + list.add(value); + + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type.getValue()); + + boolean present_applicationArgument = true && (isSetApplicationArgument()); + list.add(present_applicationArgument); + if (present_applicationArgument) + list.add(applicationArgument); + + boolean present_isRequired = true && (isSetIsRequired()); + list.add(present_isRequired); + if (present_isRequired) + list.add(isRequired); + + boolean present_requiredToAddedToCommandLine = true && (isSetRequiredToAddedToCommandLine()); + list.add(present_requiredToAddedToCommandLine); + if (present_requiredToAddedToCommandLine) + list.add(requiredToAddedToCommandLine); + + boolean present_dataMovement = true && (isSetDataMovement()); + list.add(present_dataMovement); + if (present_dataMovement) + list.add(dataMovement); + + boolean present_location = true && (isSetLocation()); + list.add(present_location); + if (present_location) + list.add(location); + + boolean present_searchQuery = true && (isSetSearchQuery()); + list.add(present_searchQuery); + if (present_searchQuery) + list.add(searchQuery); + + return list.hashCode(); } @Override @@ -992,7 +1042,7 @@ import org.slf4j.LoggerFactory; break; case 3: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = DataType.findByValue(iprot.readI32()); + struct.type = org.apache.airavata.model.appcatalog.appinterface.DataType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1195,7 +1245,7 @@ import org.slf4j.LoggerFactory; struct.setValueIsSet(true); } if (incoming.get(1)) { - struct.type = DataType.findByValue(iprot.readI32()); + struct.type = org.apache.airavata.model.appcatalog.appinterface.DataType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } if (incoming.get(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/BatchQueue.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java index f4ab850..c96ccc6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.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"}) /** * Batch Queue Information on SuperComputers * * maxRunTime: * Maximum allowed run time in hours. */ -@SuppressWarnings("all") public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue"); private static final org.apache.thrift.protocol.TField QUEUE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("queueName", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -81,7 +84,7 @@ import org.slf4j.LoggerFactory; private int maxMemory; // 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 { QUEUE_NAME((short)1, "queueName"), QUEUE_DESCRIPTION((short)2, "queueDescription"), MAX_RUN_TIME((short)3, "maxRunTime"), @@ -163,7 +166,7 @@ import org.slf4j.LoggerFactory; private static final int __MAXJOBSINQUEUE_ISSET_ID = 3; private static final int __MAXMEMORY_ISSET_ID = 4; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.QUEUE_DESCRIPTION,_Fields.MAX_RUN_TIME,_Fields.MAX_NODES,_Fields.MAX_PROCESSORS,_Fields.MAX_JOBS_IN_QUEUE,_Fields.MAX_MEMORY}; + private static final _Fields optionals[] = {_Fields.QUEUE_DESCRIPTION,_Fields.MAX_RUN_TIME,_Fields.MAX_NODES,_Fields.MAX_PROCESSORS,_Fields.MAX_JOBS_IN_QUEUE,_Fields.MAX_MEMORY}; 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); @@ -583,7 +586,44 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_queueName = true && (isSetQueueName()); + list.add(present_queueName); + if (present_queueName) + list.add(queueName); + + boolean present_queueDescription = true && (isSetQueueDescription()); + list.add(present_queueDescription); + if (present_queueDescription) + list.add(queueDescription); + + boolean present_maxRunTime = true && (isSetMaxRunTime()); + list.add(present_maxRunTime); + if (present_maxRunTime) + list.add(maxRunTime); + + boolean present_maxNodes = true && (isSetMaxNodes()); + list.add(present_maxNodes); + if (present_maxNodes) + list.add(maxNodes); + + boolean present_maxProcessors = true && (isSetMaxProcessors()); + list.add(present_maxProcessors); + if (present_maxProcessors) + list.add(maxProcessors); + + boolean present_maxJobsInQueue = true && (isSetMaxJobsInQueue()); + list.add(present_maxJobsInQueue); + if (present_maxJobsInQueue) + list.add(maxJobsInQueue); + + boolean present_maxMemory = true && (isSetMaxMemory()); + list.add(present_maxMemory); + if (present_maxMemory) + list.add(maxMemory); + + 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/CloudJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java index 3d85a15..6bc4fa3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.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"}) /** * Cloud Job Submission * * */ -@SuppressWarnings("all") public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission"); 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); @@ -78,7 +81,7 @@ import org.slf4j.LoggerFactory; private String userAccountName; // 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"), /** * @@ -565,7 +568,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_nodeId = true && (isSetNodeId()); + list.add(present_nodeId); + if (present_nodeId) + list.add(nodeId); + + boolean present_executableType = true && (isSetExecutableType()); + list.add(present_executableType); + if (present_executableType) + list.add(executableType); + + boolean present_providerName = true && (isSetProviderName()); + list.add(present_providerName); + if (present_providerName) + list.add(providerName.getValue()); + + boolean present_userAccountName = true && (isSetUserAccountName()); + list.add(present_userAccountName); + if (present_userAccountName) + list.add(userAccountName); + + return list.hashCode(); } @Override @@ -780,7 +815,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); @@ -804,7 +839,7 @@ import org.slf4j.LoggerFactory; break; case 5: // PROVIDER_NAME if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.providerName = ProviderName.findByValue(iprot.readI32()); + struct.providerName = org.apache.airavata.model.appcatalog.computeresource.ProviderName.findByValue(iprot.readI32()); struct.setProviderNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -891,13 +926,13 @@ 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.nodeId = iprot.readString(); struct.setNodeIdIsSet(true); struct.executableType = iprot.readString(); struct.setExecutableTypeIsSet(true); - struct.providerName = ProviderName.findByValue(iprot.readI32()); + struct.providerName = org.apache.airavata.model.appcatalog.computeresource.ProviderName.findByValue(iprot.readI32()); struct.setProviderNameIsSet(true); struct.userAccountName = iprot.readString(); struct.setUserAccountNameIsSet(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/ComputeResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java index 47de5a7..4d23297 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.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"}) /** * Computational Resource Description * @@ -78,7 +80,8 @@ import org.slf4j.LoggerFactory; * Map of file systems type and the path. * */ -@SuppressWarnings("all") public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription"); 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); @@ -110,7 +113,7 @@ import org.slf4j.LoggerFactory; private int maxMemoryPerNode; // 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"), HOST_NAME((short)2, "hostName"), HOST_ALIASES((short)3, "hostAliases"), @@ -197,7 +200,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __MAXMEMORYPERNODE_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE}; + private static final _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE}; 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); @@ -902,7 +905,59 @@ 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_hostName = true && (isSetHostName()); + list.add(present_hostName); + if (present_hostName) + list.add(hostName); + + boolean present_hostAliases = true && (isSetHostAliases()); + list.add(present_hostAliases); + if (present_hostAliases) + list.add(hostAliases); + + boolean present_ipAddresses = true && (isSetIpAddresses()); + list.add(present_ipAddresses); + if (present_ipAddresses) + list.add(ipAddresses); + + boolean present_resourceDescription = true && (isSetResourceDescription()); + list.add(present_resourceDescription); + if (present_resourceDescription) + list.add(resourceDescription); + + boolean present_batchQueues = true && (isSetBatchQueues()); + list.add(present_batchQueues); + if (present_batchQueues) + list.add(batchQueues); + + boolean present_fileSystems = true && (isSetFileSystems()); + list.add(present_fileSystems); + if (present_fileSystems) + list.add(fileSystems); + + boolean present_jobSubmissionInterfaces = true && (isSetJobSubmissionInterfaces()); + list.add(present_jobSubmissionInterfaces); + if (present_jobSubmissionInterfaces) + list.add(jobSubmissionInterfaces); + + boolean present_dataMovementInterfaces = true && (isSetDataMovementInterfaces()); + list.add(present_dataMovementInterfaces); + if (present_dataMovementInterfaces) + list.add(dataMovementInterfaces); + + boolean present_maxMemoryPerNode = true && (isSetMaxMemoryPerNode()); + list.add(present_maxMemoryPerNode); + if (present_maxMemoryPerNode) + list.add(maxMemoryPerNode); + + return list.hashCode(); } @Override @@ -1198,11 +1253,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list26 = iprot.readListBegin(); struct.hostAliases = new ArrayList<String>(_list26.size); - for (int _i27 = 0; _i27 < _list26.size; ++_i27) + String _elem27; + for (int _i28 = 0; _i28 < _list26.size; ++_i28) { - String _elem28; - _elem28 = iprot.readString(); - struct.hostAliases.add(_elem28); + _elem27 = iprot.readString(); + struct.hostAliases.add(_elem27); } iprot.readListEnd(); } @@ -1216,11 +1271,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list29 = iprot.readListBegin(); struct.ipAddresses = new ArrayList<String>(_list29.size); - for (int _i30 = 0; _i30 < _list29.size; ++_i30) + String _elem30; + for (int _i31 = 0; _i31 < _list29.size; ++_i31) { - String _elem31; - _elem31 = iprot.readString(); - struct.ipAddresses.add(_elem31); + _elem30 = iprot.readString(); + struct.ipAddresses.add(_elem30); } iprot.readListEnd(); } @@ -1242,12 +1297,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list32 = iprot.readListBegin(); struct.batchQueues = new ArrayList<BatchQueue>(_list32.size); - for (int _i33 = 0; _i33 < _list32.size; ++_i33) + BatchQueue _elem33; + for (int _i34 = 0; _i34 < _list32.size; ++_i34) { - BatchQueue _elem34; - _elem34 = new BatchQueue(); - _elem34.read(iprot); - struct.batchQueues.add(_elem34); + _elem33 = new BatchQueue(); + _elem33.read(iprot); + struct.batchQueues.add(_elem33); } iprot.readListEnd(); } @@ -1261,13 +1316,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin(); struct.fileSystems = new HashMap<FileSystems,String>(2*_map35.size); - for (int _i36 = 0; _i36 < _map35.size; ++_i36) + FileSystems _key36; + String _val37; + for (int _i38 = 0; _i38 < _map35.size; ++_i38) { - FileSystems _key37; - String _val38; - _key37 = FileSystems.findByValue(iprot.readI32()); - _val38 = iprot.readString(); - struct.fileSystems.put(_key37, _val38); + _key36 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32()); + _val37 = iprot.readString(); + struct.fileSystems.put(_key36, _val37); } iprot.readMapEnd(); } @@ -1281,12 +1336,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list39 = iprot.readListBegin(); struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list39.size); - for (int _i40 = 0; _i40 < _list39.size; ++_i40) + JobSubmissionInterface _elem40; + for (int _i41 = 0; _i41 < _list39.size; ++_i41) { - JobSubmissionInterface _elem41; - _elem41 = new JobSubmissionInterface(); - _elem41.read(iprot); - struct.jobSubmissionInterfaces.add(_elem41); + _elem40 = new JobSubmissionInterface(); + _elem40.read(iprot); + struct.jobSubmissionInterfaces.add(_elem40); } iprot.readListEnd(); } @@ -1300,12 +1355,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list42 = iprot.readListBegin(); struct.dataMovementInterfaces = new ArrayList<DataMovementInterface>(_list42.size); - for (int _i43 = 0; _i43 < _list42.size; ++_i43) + DataMovementInterface _elem43; + for (int _i44 = 0; _i44 < _list42.size; ++_i44) { - DataMovementInterface _elem44; - _elem44 = new DataMovementInterface(); - _elem44.read(iprot); - struct.dataMovementInterfaces.add(_elem44); + _elem43 = new DataMovementInterface(); + _elem43.read(iprot); + struct.dataMovementInterfaces.add(_elem43); } iprot.readListEnd(); } @@ -1562,11 +1617,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list57 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.hostAliases = new ArrayList<String>(_list57.size); - for (int _i58 = 0; _i58 < _list57.size; ++_i58) + String _elem58; + for (int _i59 = 0; _i59 < _list57.size; ++_i59) { - String _elem59; - _elem59 = iprot.readString(); - struct.hostAliases.add(_elem59); + _elem58 = iprot.readString(); + struct.hostAliases.add(_elem58); } } struct.setHostAliasesIsSet(true); @@ -1575,11 +1630,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list60 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.ipAddresses = new ArrayList<String>(_list60.size); - for (int _i61 = 0; _i61 < _list60.size; ++_i61) + String _elem61; + for (int _i62 = 0; _i62 < _list60.size; ++_i62) { - String _elem62; - _elem62 = iprot.readString(); - struct.ipAddresses.add(_elem62); + _elem61 = iprot.readString(); + struct.ipAddresses.add(_elem61); } } struct.setIpAddressesIsSet(true); @@ -1592,12 +1647,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list63 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.batchQueues = new ArrayList<BatchQueue>(_list63.size); - for (int _i64 = 0; _i64 < _list63.size; ++_i64) + BatchQueue _elem64; + for (int _i65 = 0; _i65 < _list63.size; ++_i65) { - BatchQueue _elem65; - _elem65 = new BatchQueue(); - _elem65.read(iprot); - struct.batchQueues.add(_elem65); + _elem64 = new BatchQueue(); + _elem64.read(iprot); + struct.batchQueues.add(_elem64); } } struct.setBatchQueuesIsSet(true); @@ -1606,13 +1661,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.fileSystems = new HashMap<FileSystems,String>(2*_map66.size); - for (int _i67 = 0; _i67 < _map66.size; ++_i67) + FileSystems _key67; + String _val68; + for (int _i69 = 0; _i69 < _map66.size; ++_i69) { - FileSystems _key68; - String _val69; - _key68 = FileSystems.findByValue(iprot.readI32()); - _val69 = iprot.readString(); - struct.fileSystems.put(_key68, _val69); + _key67 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32()); + _val68 = iprot.readString(); + struct.fileSystems.put(_key67, _val68); } } struct.setFileSystemsIsSet(true); @@ -1621,12 +1676,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list70 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list70.size); - for (int _i71 = 0; _i71 < _list70.size; ++_i71) + JobSubmissionInterface _elem71; + for (int _i72 = 0; _i72 < _list70.size; ++_i72) { - JobSubmissionInterface _elem72; - _elem72 = new JobSubmissionInterface(); - _elem72.read(iprot); - struct.jobSubmissionInterfaces.add(_elem72); + _elem71 = new JobSubmissionInterface(); + _elem71.read(iprot); + struct.jobSubmissionInterfaces.add(_elem71); } } struct.setJobSubmissionInterfacesIsSet(true); @@ -1635,12 +1690,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.dataMovementInterfaces = new ArrayList<DataMovementInterface>(_list73.size); - for (int _i74 = 0; _i74 < _list73.size; ++_i74) + DataMovementInterface _elem74; + for (int _i75 = 0; _i75 < _list73.size; ++_i75) { - DataMovementInterface _elem75; - _elem75 = new DataMovementInterface(); - _elem75.read(iprot); - struct.dataMovementInterfaces.add(_elem75); + _elem74 = new DataMovementInterface(); + _elem74.read(iprot); + struct.dataMovementInterfaces.add(_elem74); } } struct.setDataMovementInterfacesIsSet(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/DataMovementInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java index 7ec7138..1f54b34 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.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 Interfaces * @@ -59,7 +61,8 @@ import org.slf4j.LoggerFactory; * Lower the numerical number, higher the priority * */ -@SuppressWarnings("all") public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11") +public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface"); 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); @@ -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 { DATA_MOVEMENT_INTERFACE_ID((short)1, "dataMovementInterfaceId"), /** * @@ -385,7 +388,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_dataMovementProtocol = true && (isSetDataMovementProtocol()); + list.add(present_dataMovementProtocol); + if (present_dataMovementProtocol) + list.add(dataMovementProtocol.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: // DATA_MOVEMENT_PROTOCOL if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.dataMovementProtocol = DataMovementProtocol.findByValue(iprot.readI32()); + struct.dataMovementProtocol = org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.findByValue(iprot.readI32()); struct.setDataMovementProtocolIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -599,7 +619,7 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; struct.dataMovementInterfaceId = iprot.readString(); struct.setDataMovementInterfaceIdIsSet(true); - struct.dataMovementProtocol = DataMovementProtocol.findByValue(iprot.readI32()); + struct.dataMovementProtocol = org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.findByValue(iprot.readI32()); struct.setDataMovementProtocolIsSet(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/DataMovementProtocol.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementProtocol.java index fa8fd21..7c5ea86 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementProtocol.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementProtocol.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 @@ -44,7 +44,7 @@ import org.apache.thrift.TEnum; * Storage Service Provided by Unicore * */ -@SuppressWarnings("all") public enum DataMovementProtocol implements org.apache.thrift.TEnum { +public enum DataMovementProtocol implements org.apache.thrift.TEnum { LOCAL(0), SCP(1), SFTP(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/FileSystems.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.java index 3ea3e25..08f9149 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.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 @@ -44,7 +44,7 @@ import org.apache.thrift.TEnum; * The Simple Linux Utility for Resource Management is a open source workload manager. * */ -@SuppressWarnings("all") public enum FileSystems implements org.apache.thrift.TEnum { +public enum FileSystems implements org.apache.thrift.TEnum { HOME(0), WORK(1), LOCALTMP(2),
