You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/09/26 19:10:06 UTC
[37/40] airavata git commit: Merge branch 'AIRAVATA-2500' into develop
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebdf8977/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index 50d368c,d758e9d..3bcd153
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@@ -76,24 -103,33 +76,30 @@@ public class ComputeResourcePreference
private static final org.apache.thrift.protocol.TField RESERVATION_FIELD_DESC = new org.apache.thrift.protocol.TField("reservation", org.apache.thrift.protocol.TType.STRING, (short)12);
private static final org.apache.thrift.protocol.TField RESERVATION_START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("reservationStartTime", org.apache.thrift.protocol.TType.I64, (short)13);
private static final org.apache.thrift.protocol.TField RESERVATION_END_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("reservationEndTime", org.apache.thrift.protocol.TType.I64, (short)14);
+ private static final org.apache.thrift.protocol.TField SSH_ACCOUNT_PROVISIONER_FIELD_DESC = new org.apache.thrift.protocol.TField("sshAccountProvisioner", org.apache.thrift.protocol.TType.STRING, (short)15);
+ private static final org.apache.thrift.protocol.TField SSH_ACCOUNT_PROVISIONER_CONFIG_FIELD_DESC = new org.apache.thrift.protocol.TField("sshAccountProvisionerConfig", org.apache.thrift.protocol.TType.MAP, (short)16);
+ private static final org.apache.thrift.protocol.TField SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("sshAccountProvisionerAdditionalInfo", org.apache.thrift.protocol.TType.STRING, (short)17);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new ComputeResourcePreferenceStandardSchemeFactory());
- schemes.put(TupleScheme.class, new ComputeResourcePreferenceTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ComputeResourcePreferenceStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ComputeResourcePreferenceTupleSchemeFactory();
- private String computeResourceId; // required
+ private java.lang.String computeResourceId; // required
private boolean overridebyAiravata; // required
- private String loginUserName; // optional
+ private java.lang.String loginUserName; // optional
private org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol preferredJobSubmissionProtocol; // optional
private org.apache.airavata.model.data.movement.DataMovementProtocol preferredDataMovementProtocol; // optional
- private String preferredBatchQueue; // optional
- private String scratchLocation; // optional
- private String allocationProjectNumber; // optional
- private String resourceSpecificCredentialStoreToken; // optional
- private String usageReportingGatewayId; // optional
- private String qualityOfService; // optional
- private String reservation; // optional
+ private java.lang.String preferredBatchQueue; // optional
+ private java.lang.String scratchLocation; // optional
+ private java.lang.String allocationProjectNumber; // optional
+ private java.lang.String resourceSpecificCredentialStoreToken; // optional
+ private java.lang.String usageReportingGatewayId; // optional
+ private java.lang.String qualityOfService; // optional
+ private java.lang.String reservation; // optional
private long reservationStartTime; // optional
private long reservationEndTime; // optional
- private String sshAccountProvisioner; // optional
- private Map<String,String> sshAccountProvisionerConfig; // optional
- private String sshAccountProvisionerAdditionalInfo; // optional
++ private java.lang.String sshAccountProvisioner; // optional
++ private java.util.Map<java.lang.String,java.lang.String> sshAccountProvisionerConfig; // optional
++ private java.lang.String sshAccountProvisionerAdditionalInfo; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@@ -118,12 -154,15 +124,15 @@@
QUALITY_OF_SERVICE((short)11, "qualityOfService"),
RESERVATION((short)12, "reservation"),
RESERVATION_START_TIME((short)13, "reservationStartTime"),
- RESERVATION_END_TIME((short)14, "reservationEndTime");
+ RESERVATION_END_TIME((short)14, "reservationEndTime"),
+ SSH_ACCOUNT_PROVISIONER((short)15, "sshAccountProvisioner"),
+ SSH_ACCOUNT_PROVISIONER_CONFIG((short)16, "sshAccountProvisionerConfig"),
+ SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO((short)17, "sshAccountProvisionerAdditionalInfo");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@@ -205,10 -250,10 +220,10 @@@
private static final int __RESERVATIONSTARTTIME_ISSET_ID = 1;
private static final int __RESERVATIONENDTIME_ISSET_ID = 2;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN,_Fields.USAGE_REPORTING_GATEWAY_ID,_Fields.QUALITY_OF_SERVICE,_Fields.RESERVATION,_Fields.RESERVATION_START_TIME,_Fields.RESERVATION_END_TIME};
+ private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN,_Fields.USAGE_REPORTING_GATEWAY_ID,_Fields.QUALITY_OF_SERVICE,_Fields.RESERVATION,_Fields.RESERVATION_START_TIME,_Fields.RESERVATION_END_TIME,_Fields.SSH_ACCOUNT_PROVISIONER,_Fields.SSH_ACCOUNT_PROVISIONER_CONFIG,_Fields.SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO};
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.OVERRIDEBY_AIRAVATA, new org.apache.thrift.meta_data.FieldMetaData("overridebyAiravata", org.apache.thrift.TFieldRequirementType.REQUIRED,
@@@ -237,7 -282,15 +252,15 @@@
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.RESERVATION_END_TIME, new org.apache.thrift.meta_data.FieldMetaData("reservationEndTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.SSH_ACCOUNT_PROVISIONER, new org.apache.thrift.meta_data.FieldMetaData("sshAccountProvisioner", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.SSH_ACCOUNT_PROVISIONER_CONFIG, new org.apache.thrift.meta_data.FieldMetaData("sshAccountProvisionerConfig", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO, new org.apache.thrift.meta_data.FieldMetaData("sshAccountProvisionerAdditionalInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputeResourcePreference.class, metaDataMap);
}
@@@ -297,6 -350,16 +320,16 @@@
}
this.reservationStartTime = other.reservationStartTime;
this.reservationEndTime = other.reservationEndTime;
+ if (other.isSetSshAccountProvisioner()) {
+ this.sshAccountProvisioner = other.sshAccountProvisioner;
+ }
+ if (other.isSetSshAccountProvisionerConfig()) {
- Map<String,String> __this__sshAccountProvisionerConfig = new HashMap<String,String>(other.sshAccountProvisionerConfig);
++ java.util.Map<java.lang.String,java.lang.String> __this__sshAccountProvisionerConfig = new java.util.HashMap<java.lang.String,java.lang.String>(other.sshAccountProvisionerConfig);
+ this.sshAccountProvisionerConfig = __this__sshAccountProvisionerConfig;
+ }
+ if (other.isSetSshAccountProvisionerAdditionalInfo()) {
+ this.sshAccountProvisionerAdditionalInfo = other.sshAccountProvisionerAdditionalInfo;
+ }
}
public ComputeResourcePreference deepCopy() {
@@@ -322,9 -385,12 +355,12 @@@
this.reservationStartTime = 0;
setReservationEndTimeIsSet(false);
this.reservationEndTime = 0;
+ this.sshAccountProvisioner = null;
+ this.sshAccountProvisionerConfig = null;
+ this.sshAccountProvisionerAdditionalInfo = null;
}
- public String getComputeResourceId() {
+ public java.lang.String getComputeResourceId() {
return this.computeResourceId;
}
@@@ -656,10 -722,90 +692,90 @@@
}
public void setReservationEndTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID, value);
}
- public String getSshAccountProvisioner() {
++ public java.lang.String getSshAccountProvisioner() {
+ return this.sshAccountProvisioner;
+ }
+
- public void setSshAccountProvisioner(String sshAccountProvisioner) {
++ public void setSshAccountProvisioner(java.lang.String sshAccountProvisioner) {
+ this.sshAccountProvisioner = sshAccountProvisioner;
+ }
+
+ public void unsetSshAccountProvisioner() {
+ this.sshAccountProvisioner = null;
+ }
+
+ /** Returns true if field sshAccountProvisioner is set (has been assigned a value) and false otherwise */
+ public boolean isSetSshAccountProvisioner() {
+ return this.sshAccountProvisioner != null;
+ }
+
+ public void setSshAccountProvisionerIsSet(boolean value) {
+ if (!value) {
+ this.sshAccountProvisioner = null;
+ }
+ }
+
+ public int getSshAccountProvisionerConfigSize() {
+ return (this.sshAccountProvisionerConfig == null) ? 0 : this.sshAccountProvisionerConfig.size();
+ }
+
- public void putToSshAccountProvisionerConfig(String key, String val) {
++ public void putToSshAccountProvisionerConfig(java.lang.String key, java.lang.String val) {
+ if (this.sshAccountProvisionerConfig == null) {
- this.sshAccountProvisionerConfig = new HashMap<String,String>();
++ this.sshAccountProvisionerConfig = new java.util.HashMap<java.lang.String,java.lang.String>();
+ }
+ this.sshAccountProvisionerConfig.put(key, val);
+ }
+
- public Map<String,String> getSshAccountProvisionerConfig() {
++ public java.util.Map<java.lang.String,java.lang.String> getSshAccountProvisionerConfig() {
+ return this.sshAccountProvisionerConfig;
+ }
+
- public void setSshAccountProvisionerConfig(Map<String,String> sshAccountProvisionerConfig) {
++ public void setSshAccountProvisionerConfig(java.util.Map<java.lang.String,java.lang.String> sshAccountProvisionerConfig) {
+ this.sshAccountProvisionerConfig = sshAccountProvisionerConfig;
+ }
+
+ public void unsetSshAccountProvisionerConfig() {
+ this.sshAccountProvisionerConfig = null;
+ }
+
+ /** Returns true if field sshAccountProvisionerConfig is set (has been assigned a value) and false otherwise */
+ public boolean isSetSshAccountProvisionerConfig() {
+ return this.sshAccountProvisionerConfig != null;
+ }
+
+ public void setSshAccountProvisionerConfigIsSet(boolean value) {
+ if (!value) {
+ this.sshAccountProvisionerConfig = null;
+ }
+ }
+
- public String getSshAccountProvisionerAdditionalInfo() {
++ public java.lang.String getSshAccountProvisionerAdditionalInfo() {
+ return this.sshAccountProvisionerAdditionalInfo;
+ }
+
- public void setSshAccountProvisionerAdditionalInfo(String sshAccountProvisionerAdditionalInfo) {
++ public void setSshAccountProvisionerAdditionalInfo(java.lang.String sshAccountProvisionerAdditionalInfo) {
+ this.sshAccountProvisionerAdditionalInfo = sshAccountProvisionerAdditionalInfo;
+ }
+
+ public void unsetSshAccountProvisionerAdditionalInfo() {
+ this.sshAccountProvisionerAdditionalInfo = null;
+ }
+
+ /** Returns true if field sshAccountProvisionerAdditionalInfo is set (has been assigned a value) and false otherwise */
+ public boolean isSetSshAccountProvisionerAdditionalInfo() {
+ return this.sshAccountProvisionerAdditionalInfo != null;
+ }
+
+ public void setSshAccountProvisionerAdditionalInfoIsSet(boolean value) {
+ if (!value) {
+ this.sshAccountProvisionerAdditionalInfo = null;
+ }
+ }
+
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case COMPUTE_RESOURCE_ID:
if (value == null) {
@@@ -773,6 -919,30 +889,30 @@@
}
break;
+ case SSH_ACCOUNT_PROVISIONER:
+ if (value == null) {
+ unsetSshAccountProvisioner();
+ } else {
- setSshAccountProvisioner((String)value);
++ setSshAccountProvisioner((java.lang.String)value);
+ }
+ break;
+
+ case SSH_ACCOUNT_PROVISIONER_CONFIG:
+ if (value == null) {
+ unsetSshAccountProvisionerConfig();
+ } else {
- setSshAccountProvisionerConfig((Map<String,String>)value);
++ setSshAccountProvisionerConfig((java.util.Map<java.lang.String,java.lang.String>)value);
+ }
+ break;
+
+ case SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO:
+ if (value == null) {
+ unsetSshAccountProvisionerAdditionalInfo();
+ } else {
- setSshAccountProvisionerAdditionalInfo((String)value);
++ setSshAccountProvisionerAdditionalInfo((java.lang.String)value);
+ }
+ break;
+
}
}
@@@ -820,8 -990,17 +960,17 @@@
case RESERVATION_END_TIME:
return getReservationEndTime();
+ case SSH_ACCOUNT_PROVISIONER:
+ return getSshAccountProvisioner();
+
+ case SSH_ACCOUNT_PROVISIONER_CONFIG:
+ return getSshAccountProvisionerConfig();
+
+ case SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO:
+ return getSshAccountProvisionerAdditionalInfo();
+
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
/** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
@@@ -859,8 -1038,14 +1008,14 @@@
return isSetReservationStartTime();
case RESERVATION_END_TIME:
return isSetReservationEndTime();
+ case SSH_ACCOUNT_PROVISIONER:
+ return isSetSshAccountProvisioner();
+ case SSH_ACCOUNT_PROVISIONER_CONFIG:
+ return isSetSshAccountProvisionerConfig();
+ case SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO:
+ return isSetSshAccountProvisionerAdditionalInfo();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
@@@ -1009,63 -1219,94 +1191,75 @@@
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_computeResourceId = true && (isSetComputeResourceId());
- list.add(present_computeResourceId);
- if (present_computeResourceId)
- list.add(computeResourceId);
-
- boolean present_overridebyAiravata = true;
- list.add(present_overridebyAiravata);
- if (present_overridebyAiravata)
- list.add(overridebyAiravata);
-
- boolean present_loginUserName = true && (isSetLoginUserName());
- list.add(present_loginUserName);
- if (present_loginUserName)
- list.add(loginUserName);
-
- boolean present_preferredJobSubmissionProtocol = true && (isSetPreferredJobSubmissionProtocol());
- list.add(present_preferredJobSubmissionProtocol);
- if (present_preferredJobSubmissionProtocol)
- list.add(preferredJobSubmissionProtocol.getValue());
-
- boolean present_preferredDataMovementProtocol = true && (isSetPreferredDataMovementProtocol());
- list.add(present_preferredDataMovementProtocol);
- if (present_preferredDataMovementProtocol)
- list.add(preferredDataMovementProtocol.getValue());
-
- boolean present_preferredBatchQueue = true && (isSetPreferredBatchQueue());
- list.add(present_preferredBatchQueue);
- if (present_preferredBatchQueue)
- list.add(preferredBatchQueue);
-
- boolean present_scratchLocation = true && (isSetScratchLocation());
- list.add(present_scratchLocation);
- if (present_scratchLocation)
- list.add(scratchLocation);
-
- boolean present_allocationProjectNumber = true && (isSetAllocationProjectNumber());
- list.add(present_allocationProjectNumber);
- if (present_allocationProjectNumber)
- list.add(allocationProjectNumber);
-
- boolean present_resourceSpecificCredentialStoreToken = true && (isSetResourceSpecificCredentialStoreToken());
- list.add(present_resourceSpecificCredentialStoreToken);
- if (present_resourceSpecificCredentialStoreToken)
- list.add(resourceSpecificCredentialStoreToken);
-
- boolean present_usageReportingGatewayId = true && (isSetUsageReportingGatewayId());
- list.add(present_usageReportingGatewayId);
- if (present_usageReportingGatewayId)
- list.add(usageReportingGatewayId);
-
- boolean present_qualityOfService = true && (isSetQualityOfService());
- list.add(present_qualityOfService);
- if (present_qualityOfService)
- list.add(qualityOfService);
-
- boolean present_reservation = true && (isSetReservation());
- list.add(present_reservation);
- if (present_reservation)
- list.add(reservation);
-
- boolean present_reservationStartTime = true && (isSetReservationStartTime());
- list.add(present_reservationStartTime);
- if (present_reservationStartTime)
- list.add(reservationStartTime);
-
- boolean present_reservationEndTime = true && (isSetReservationEndTime());
- list.add(present_reservationEndTime);
- if (present_reservationEndTime)
- list.add(reservationEndTime);
-
- boolean present_sshAccountProvisioner = true && (isSetSshAccountProvisioner());
- list.add(present_sshAccountProvisioner);
- if (present_sshAccountProvisioner)
- list.add(sshAccountProvisioner);
-
- boolean present_sshAccountProvisionerConfig = true && (isSetSshAccountProvisionerConfig());
- list.add(present_sshAccountProvisionerConfig);
- if (present_sshAccountProvisionerConfig)
- list.add(sshAccountProvisionerConfig);
-
- boolean present_sshAccountProvisionerAdditionalInfo = true && (isSetSshAccountProvisionerAdditionalInfo());
- list.add(present_sshAccountProvisionerAdditionalInfo);
- if (present_sshAccountProvisionerAdditionalInfo)
- list.add(sshAccountProvisionerAdditionalInfo);
-
- return list.hashCode();
+ int hashCode = 1;
+
+ hashCode = hashCode * 8191 + ((isSetComputeResourceId()) ? 131071 : 524287);
+ if (isSetComputeResourceId())
+ hashCode = hashCode * 8191 + computeResourceId.hashCode();
+
+ hashCode = hashCode * 8191 + ((overridebyAiravata) ? 131071 : 524287);
+
+ hashCode = hashCode * 8191 + ((isSetLoginUserName()) ? 131071 : 524287);
+ if (isSetLoginUserName())
+ hashCode = hashCode * 8191 + loginUserName.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetPreferredJobSubmissionProtocol()) ? 131071 : 524287);
+ if (isSetPreferredJobSubmissionProtocol())
+ hashCode = hashCode * 8191 + preferredJobSubmissionProtocol.getValue();
+
+ hashCode = hashCode * 8191 + ((isSetPreferredDataMovementProtocol()) ? 131071 : 524287);
+ if (isSetPreferredDataMovementProtocol())
+ hashCode = hashCode * 8191 + preferredDataMovementProtocol.getValue();
+
+ hashCode = hashCode * 8191 + ((isSetPreferredBatchQueue()) ? 131071 : 524287);
+ if (isSetPreferredBatchQueue())
+ hashCode = hashCode * 8191 + preferredBatchQueue.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetScratchLocation()) ? 131071 : 524287);
+ if (isSetScratchLocation())
+ hashCode = hashCode * 8191 + scratchLocation.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetAllocationProjectNumber()) ? 131071 : 524287);
+ if (isSetAllocationProjectNumber())
+ hashCode = hashCode * 8191 + allocationProjectNumber.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetResourceSpecificCredentialStoreToken()) ? 131071 : 524287);
+ if (isSetResourceSpecificCredentialStoreToken())
+ hashCode = hashCode * 8191 + resourceSpecificCredentialStoreToken.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetUsageReportingGatewayId()) ? 131071 : 524287);
+ if (isSetUsageReportingGatewayId())
+ hashCode = hashCode * 8191 + usageReportingGatewayId.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetQualityOfService()) ? 131071 : 524287);
+ if (isSetQualityOfService())
+ hashCode = hashCode * 8191 + qualityOfService.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetReservation()) ? 131071 : 524287);
+ if (isSetReservation())
+ hashCode = hashCode * 8191 + reservation.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetReservationStartTime()) ? 131071 : 524287);
+ if (isSetReservationStartTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reservationStartTime);
+
+ hashCode = hashCode * 8191 + ((isSetReservationEndTime()) ? 131071 : 524287);
+ if (isSetReservationEndTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reservationEndTime);
+
++ hashCode = hashCode * 8191 + ((isSetSshAccountProvisioner()) ? 131071 : 524287);
++ if (isSetSshAccountProvisioner())
++ hashCode = hashCode * 8191 + sshAccountProvisioner.hashCode();
++
++ hashCode = hashCode * 8191 + ((isSetSshAccountProvisionerConfig()) ? 131071 : 524287);
++ if (isSetSshAccountProvisionerConfig())
++ hashCode = hashCode * 8191 + sshAccountProvisionerConfig.hashCode();
++
++ hashCode = hashCode * 8191 + ((isSetSshAccountProvisionerAdditionalInfo()) ? 131071 : 524287);
++ if (isSetSshAccountProvisionerAdditionalInfo())
++ hashCode = hashCode * 8191 + sshAccountProvisionerAdditionalInfo.hashCode();
++
+ return hashCode;
}
@Override
@@@ -1216,6 -1457,36 +1410,36 @@@
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetSshAccountProvisioner()).compareTo(other.isSetSshAccountProvisioner());
++ lastComparison = java.lang.Boolean.valueOf(isSetSshAccountProvisioner()).compareTo(other.isSetSshAccountProvisioner());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSshAccountProvisioner()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshAccountProvisioner, other.sshAccountProvisioner);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
- lastComparison = Boolean.valueOf(isSetSshAccountProvisionerConfig()).compareTo(other.isSetSshAccountProvisionerConfig());
++ lastComparison = java.lang.Boolean.valueOf(isSetSshAccountProvisionerConfig()).compareTo(other.isSetSshAccountProvisionerConfig());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSshAccountProvisionerConfig()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshAccountProvisionerConfig, other.sshAccountProvisionerConfig);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
- lastComparison = Boolean.valueOf(isSetSshAccountProvisionerAdditionalInfo()).compareTo(other.isSetSshAccountProvisionerAdditionalInfo());
++ lastComparison = java.lang.Boolean.valueOf(isSetSshAccountProvisionerAdditionalInfo()).compareTo(other.isSetSshAccountProvisionerAdditionalInfo());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSshAccountProvisionerAdditionalInfo()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshAccountProvisionerAdditionalInfo, other.sshAccountProvisionerAdditionalInfo);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@@ -1524,6 -1825,42 +1778,42 @@@
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 15: // SSH_ACCOUNT_PROVISIONER
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.sshAccountProvisioner = iprot.readString();
+ struct.setSshAccountProvisionerIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 16: // SSH_ACCOUNT_PROVISIONER_CONFIG
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
- struct.sshAccountProvisionerConfig = new HashMap<String,String>(2*_map0.size);
- String _key1;
- String _val2;
++ struct.sshAccountProvisionerConfig = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map0.size);
++ java.lang.String _key1;
++ java.lang.String _val2;
+ for (int _i3 = 0; _i3 < _map0.size; ++_i3)
+ {
+ _key1 = iprot.readString();
+ _val2 = iprot.readString();
+ struct.sshAccountProvisionerConfig.put(_key1, _val2);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setSshAccountProvisionerConfigIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 17: // SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.sshAccountProvisionerAdditionalInfo = iprot.readString();
+ struct.setSshAccountProvisionerAdditionalInfoIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@@ -1625,6 -1962,35 +1915,35 @@@
oprot.writeI64(struct.reservationEndTime);
oprot.writeFieldEnd();
}
+ if (struct.sshAccountProvisioner != null) {
+ if (struct.isSetSshAccountProvisioner()) {
+ oprot.writeFieldBegin(SSH_ACCOUNT_PROVISIONER_FIELD_DESC);
+ oprot.writeString(struct.sshAccountProvisioner);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.sshAccountProvisionerConfig != null) {
+ if (struct.isSetSshAccountProvisionerConfig()) {
+ oprot.writeFieldBegin(SSH_ACCOUNT_PROVISIONER_CONFIG_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.sshAccountProvisionerConfig.size()));
- for (Map.Entry<String, String> _iter4 : struct.sshAccountProvisionerConfig.entrySet())
++ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter4 : struct.sshAccountProvisionerConfig.entrySet())
+ {
+ oprot.writeString(_iter4.getKey());
+ oprot.writeString(_iter4.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.sshAccountProvisionerAdditionalInfo != null) {
+ if (struct.isSetSshAccountProvisionerAdditionalInfo()) {
+ oprot.writeFieldBegin(SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO_FIELD_DESC);
+ oprot.writeString(struct.sshAccountProvisionerAdditionalInfo);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@@ -1718,6 -2093,22 +2046,22 @@@
if (struct.isSetReservationEndTime()) {
oprot.writeI64(struct.reservationEndTime);
}
+ if (struct.isSetSshAccountProvisioner()) {
+ oprot.writeString(struct.sshAccountProvisioner);
+ }
+ if (struct.isSetSshAccountProvisionerConfig()) {
+ {
+ oprot.writeI32(struct.sshAccountProvisionerConfig.size());
- for (Map.Entry<String, String> _iter5 : struct.sshAccountProvisionerConfig.entrySet())
++ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter5 : struct.sshAccountProvisionerConfig.entrySet())
+ {
+ oprot.writeString(_iter5.getKey());
+ oprot.writeString(_iter5.getValue());
+ }
+ }
+ }
+ if (struct.isSetSshAccountProvisionerAdditionalInfo()) {
+ oprot.writeString(struct.sshAccountProvisionerAdditionalInfo);
+ }
}
@Override
@@@ -1727,7 -2118,7 +2071,7 @@@
struct.setComputeResourceIdIsSet(true);
struct.overridebyAiravata = iprot.readBool();
struct.setOverridebyAiravataIsSet(true);
- java.util.BitSet incoming = iprot.readBitSet(12);
- BitSet incoming = iprot.readBitSet(15);
++ java.util.BitSet incoming = iprot.readBitSet(15);
if (incoming.get(0)) {
struct.loginUserName = iprot.readString();
struct.setLoginUserNameIsSet(true);
@@@ -1776,6 -2167,29 +2120,29 @@@
struct.reservationEndTime = iprot.readI64();
struct.setReservationEndTimeIsSet(true);
}
+ if (incoming.get(12)) {
+ struct.sshAccountProvisioner = iprot.readString();
+ struct.setSshAccountProvisionerIsSet(true);
+ }
+ if (incoming.get(13)) {
+ {
+ org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.sshAccountProvisionerConfig = new HashMap<String,String>(2*_map6.size);
- String _key7;
- String _val8;
++ struct.sshAccountProvisionerConfig = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map6.size);
++ java.lang.String _key7;
++ java.lang.String _val8;
+ for (int _i9 = 0; _i9 < _map6.size; ++_i9)
+ {
+ _key7 = iprot.readString();
+ _val8 = iprot.readString();
+ struct.sshAccountProvisionerConfig.put(_key7, _val8);
+ }
+ }
+ struct.setSshAccountProvisionerConfigIsSet(true);
+ }
+ if (incoming.get(14)) {
+ struct.sshAccountProvisionerAdditionalInfo = iprot.readString();
+ struct.setSshAccountProvisionerAdditionalInfoIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebdf8977/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
index cb2f0fb,725bf43..7ed1054
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@@ -796,14 -830,14 +796,14 @@@ public class GatewayResourceProfile imp
case 3: // COMPUTE_RESOURCE_PREFERENCES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- struct.computeResourcePreferences = new java.util.ArrayList<ComputeResourcePreference>(_list0.size);
- ComputeResourcePreference _elem1;
- for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ org.apache.thrift.protocol.TList _list10 = iprot.readListBegin();
- struct.computeResourcePreferences = new ArrayList<ComputeResourcePreference>(_list10.size);
++ struct.computeResourcePreferences = new java.util.ArrayList<ComputeResourcePreference>(_list10.size);
+ ComputeResourcePreference _elem11;
+ for (int _i12 = 0; _i12 < _list10.size; ++_i12)
{
- _elem1 = new ComputeResourcePreference();
- _elem1.read(iprot);
- struct.computeResourcePreferences.add(_elem1);
+ _elem11 = new ComputeResourcePreference();
+ _elem11.read(iprot);
+ struct.computeResourcePreferences.add(_elem11);
}
iprot.readListEnd();
}
@@@ -815,14 -849,14 +815,14 @@@
case 4: // STORAGE_PREFERENCES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
- struct.storagePreferences = new java.util.ArrayList<StoragePreference>(_list3.size);
- StoragePreference _elem4;
- for (int _i5 = 0; _i5 < _list3.size; ++_i5)
+ org.apache.thrift.protocol.TList _list13 = iprot.readListBegin();
- struct.storagePreferences = new ArrayList<StoragePreference>(_list13.size);
++ struct.storagePreferences = new java.util.ArrayList<StoragePreference>(_list13.size);
+ StoragePreference _elem14;
+ for (int _i15 = 0; _i15 < _list13.size; ++_i15)
{
- _elem4 = new StoragePreference();
- _elem4.read(iprot);
- struct.storagePreferences.add(_elem4);
+ _elem14 = new StoragePreference();
+ _elem14.read(iprot);
+ struct.storagePreferences.add(_elem14);
}
iprot.readListEnd();
}
@@@ -990,28 -1024,28 +990,28 @@@
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.computeResourcePreferences = new java.util.ArrayList<ComputeResourcePreference>(_list10.size);
- ComputeResourcePreference _elem11;
- for (int _i12 = 0; _i12 < _list10.size; ++_i12)
+ org.apache.thrift.protocol.TList _list20 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.computeResourcePreferences = new ArrayList<ComputeResourcePreference>(_list20.size);
++ struct.computeResourcePreferences = new java.util.ArrayList<ComputeResourcePreference>(_list20.size);
+ ComputeResourcePreference _elem21;
+ for (int _i22 = 0; _i22 < _list20.size; ++_i22)
{
- _elem11 = new ComputeResourcePreference();
- _elem11.read(iprot);
- struct.computeResourcePreferences.add(_elem11);
+ _elem21 = new ComputeResourcePreference();
+ _elem21.read(iprot);
+ struct.computeResourcePreferences.add(_elem21);
}
}
struct.setComputeResourcePreferencesIsSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.storagePreferences = new java.util.ArrayList<StoragePreference>(_list13.size);
- StoragePreference _elem14;
- for (int _i15 = 0; _i15 < _list13.size; ++_i15)
+ org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.storagePreferences = new ArrayList<StoragePreference>(_list23.size);
++ struct.storagePreferences = new java.util.ArrayList<StoragePreference>(_list23.size);
+ StoragePreference _elem24;
+ for (int _i25 = 0; _i25 < _list23.size; ++_i25)
{
- _elem14 = new StoragePreference();
- _elem14.read(iprot);
- struct.storagePreferences.add(_elem14);
+ _elem24 = new StoragePreference();
+ _elem24.read(iprot);
+ struct.storagePreferences.add(_elem24);
}
}
struct.setStoragePreferencesIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebdf8977/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserComputeResourcePreference.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserComputeResourcePreference.java
index c4a179c,674b5c3..1f30554
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/userresourceprofile/UserComputeResourcePreference.java
@@@ -50,8 -77,13 +50,13 @@@ package org.apache.airavata.model.appca
* Resource specific credential store token. If this token is specified, then it is superceeded by the gateway's
* default credential store.
*
+ * validated:
+ * If true the the configuration has been validated in the sense that the username and credential can be used to
+ * login to the remote host and the scratchLocation is a valid location that the user has permission to write to.
+ * Should be treated as read-only and only mutated by Airavata middleware.
+ *
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class UserComputeResourcePreference implements org.apache.thrift.TBase<UserComputeResourcePreference, UserComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<UserComputeResourcePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserComputeResourcePreference");
@@@ -65,20 -97,25 +70,22 @@@
private static final org.apache.thrift.protocol.TField RESERVATION_FIELD_DESC = new org.apache.thrift.protocol.TField("reservation", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField RESERVATION_START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("reservationStartTime", org.apache.thrift.protocol.TType.I64, (short)9);
private static final org.apache.thrift.protocol.TField RESERVATION_END_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("reservationEndTime", org.apache.thrift.protocol.TType.I64, (short)10);
+ private static final org.apache.thrift.protocol.TField VALIDATED_FIELD_DESC = new org.apache.thrift.protocol.TField("validated", org.apache.thrift.protocol.TType.BOOL, (short)11);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new UserComputeResourcePreferenceStandardSchemeFactory());
- schemes.put(TupleScheme.class, new UserComputeResourcePreferenceTupleSchemeFactory());
- }
-
- private String computeResourceId; // required
- private String loginUserName; // optional
- private String preferredBatchQueue; // optional
- private String scratchLocation; // optional
- private String allocationProjectNumber; // optional
- private String resourceSpecificCredentialStoreToken; // optional
- private String qualityOfService; // optional
- private String reservation; // optional
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UserComputeResourcePreferenceStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UserComputeResourcePreferenceTupleSchemeFactory();
+
+ private java.lang.String computeResourceId; // required
+ private java.lang.String loginUserName; // optional
+ private java.lang.String preferredBatchQueue; // optional
+ private java.lang.String scratchLocation; // optional
+ private java.lang.String allocationProjectNumber; // optional
+ private java.lang.String resourceSpecificCredentialStoreToken; // optional
+ private java.lang.String qualityOfService; // optional
+ private java.lang.String reservation; // optional
private long reservationStartTime; // optional
private long reservationEndTime; // optional
+ private boolean validated; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@@ -91,12 -128,13 +98,13 @@@
QUALITY_OF_SERVICE((short)7, "qualityOfService"),
RESERVATION((short)8, "reservation"),
RESERVATION_START_TIME((short)9, "reservationStartTime"),
- RESERVATION_END_TIME((short)10, "reservationEndTime");
+ RESERVATION_END_TIME((short)10, "reservationEndTime"),
+ VALIDATED((short)11, "validated");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@@ -168,11 -208,12 +178,12 @@@
// isset id assignments
private static final int __RESERVATIONSTARTTIME_ISSET_ID = 0;
private static final int __RESERVATIONENDTIME_ISSET_ID = 1;
+ private static final int __VALIDATED_ISSET_ID = 2;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN,_Fields.QUALITY_OF_SERVICE,_Fields.RESERVATION,_Fields.RESERVATION_START_TIME,_Fields.RESERVATION_END_TIME};
+ private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN,_Fields.QUALITY_OF_SERVICE,_Fields.RESERVATION,_Fields.RESERVATION_START_TIME,_Fields.RESERVATION_END_TIME,_Fields.VALIDATED};
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.LOGIN_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("loginUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@@ -193,7 -234,9 +204,9 @@@
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.RESERVATION_END_TIME, new org.apache.thrift.meta_data.FieldMetaData("reservationEndTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.VALIDATED, new org.apache.thrift.meta_data.FieldMetaData("validated", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UserComputeResourcePreference.class, metaDataMap);
}
@@@ -258,9 -304,11 +274,11 @@@
this.reservationStartTime = 0;
setReservationEndTimeIsSet(false);
this.reservationEndTime = 0;
+ this.validated = false;
+
}
- public String getComputeResourceId() {
+ public java.lang.String getComputeResourceId() {
return this.computeResourceId;
}
@@@ -485,10 -533,32 +503,32 @@@
}
public void setReservationEndTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID, value);
}
+ public boolean isValidated() {
+ return this.validated;
+ }
+
+ public void setValidated(boolean validated) {
+ this.validated = validated;
+ setValidatedIsSet(true);
+ }
+
+ public void unsetValidated() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VALIDATED_ISSET_ID);
++ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VALIDATED_ISSET_ID);
+ }
+
+ /** Returns true if field validated is set (has been assigned a value) and false otherwise */
+ public boolean isSetValidated() {
- return EncodingUtils.testBit(__isset_bitfield, __VALIDATED_ISSET_ID);
++ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VALIDATED_ISSET_ID);
+ }
+
+ public void setValidatedIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VALIDATED_ISSET_ID, value);
++ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VALIDATED_ISSET_ID, value);
+ }
+
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case COMPUTE_RESOURCE_ID:
if (value == null) {
@@@ -570,6 -640,14 +610,14 @@@
}
break;
+ case VALIDATED:
+ if (value == null) {
+ unsetValidated();
+ } else {
- setValidated((Boolean)value);
++ setValidated((java.lang.Boolean)value);
+ }
+ break;
+
}
}
@@@ -605,8 -683,11 +653,11 @@@
case RESERVATION_END_TIME:
return getReservationEndTime();
+ case VALIDATED:
+ return isValidated();
+
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
/** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
@@@ -636,8 -717,10 +687,10 @@@
return isSetReservationStartTime();
case RESERVATION_END_TIME:
return isSetReservationEndTime();
+ case VALIDATED:
+ return isSetValidated();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
@@@ -750,49 -840,64 +812,53 @@@
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_computeResourceId = true && (isSetComputeResourceId());
- list.add(present_computeResourceId);
- if (present_computeResourceId)
- list.add(computeResourceId);
-
- boolean present_loginUserName = true && (isSetLoginUserName());
- list.add(present_loginUserName);
- if (present_loginUserName)
- list.add(loginUserName);
-
- boolean present_preferredBatchQueue = true && (isSetPreferredBatchQueue());
- list.add(present_preferredBatchQueue);
- if (present_preferredBatchQueue)
- list.add(preferredBatchQueue);
-
- boolean present_scratchLocation = true && (isSetScratchLocation());
- list.add(present_scratchLocation);
- if (present_scratchLocation)
- list.add(scratchLocation);
-
- boolean present_allocationProjectNumber = true && (isSetAllocationProjectNumber());
- list.add(present_allocationProjectNumber);
- if (present_allocationProjectNumber)
- list.add(allocationProjectNumber);
-
- boolean present_resourceSpecificCredentialStoreToken = true && (isSetResourceSpecificCredentialStoreToken());
- list.add(present_resourceSpecificCredentialStoreToken);
- if (present_resourceSpecificCredentialStoreToken)
- list.add(resourceSpecificCredentialStoreToken);
-
- boolean present_qualityOfService = true && (isSetQualityOfService());
- list.add(present_qualityOfService);
- if (present_qualityOfService)
- list.add(qualityOfService);
-
- boolean present_reservation = true && (isSetReservation());
- list.add(present_reservation);
- if (present_reservation)
- list.add(reservation);
-
- boolean present_reservationStartTime = true && (isSetReservationStartTime());
- list.add(present_reservationStartTime);
- if (present_reservationStartTime)
- list.add(reservationStartTime);
-
- boolean present_reservationEndTime = true && (isSetReservationEndTime());
- list.add(present_reservationEndTime);
- if (present_reservationEndTime)
- list.add(reservationEndTime);
-
- boolean present_validated = true && (isSetValidated());
- list.add(present_validated);
- if (present_validated)
- list.add(validated);
-
- return list.hashCode();
+ int hashCode = 1;
+
+ hashCode = hashCode * 8191 + ((isSetComputeResourceId()) ? 131071 : 524287);
+ if (isSetComputeResourceId())
+ hashCode = hashCode * 8191 + computeResourceId.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetLoginUserName()) ? 131071 : 524287);
+ if (isSetLoginUserName())
+ hashCode = hashCode * 8191 + loginUserName.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetPreferredBatchQueue()) ? 131071 : 524287);
+ if (isSetPreferredBatchQueue())
+ hashCode = hashCode * 8191 + preferredBatchQueue.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetScratchLocation()) ? 131071 : 524287);
+ if (isSetScratchLocation())
+ hashCode = hashCode * 8191 + scratchLocation.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetAllocationProjectNumber()) ? 131071 : 524287);
+ if (isSetAllocationProjectNumber())
+ hashCode = hashCode * 8191 + allocationProjectNumber.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetResourceSpecificCredentialStoreToken()) ? 131071 : 524287);
+ if (isSetResourceSpecificCredentialStoreToken())
+ hashCode = hashCode * 8191 + resourceSpecificCredentialStoreToken.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetQualityOfService()) ? 131071 : 524287);
+ if (isSetQualityOfService())
+ hashCode = hashCode * 8191 + qualityOfService.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetReservation()) ? 131071 : 524287);
+ if (isSetReservation())
+ hashCode = hashCode * 8191 + reservation.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetReservationStartTime()) ? 131071 : 524287);
+ if (isSetReservationStartTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reservationStartTime);
+
+ hashCode = hashCode * 8191 + ((isSetReservationEndTime()) ? 131071 : 524287);
+ if (isSetReservationEndTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reservationEndTime);
+
++ hashCode = hashCode * 8191 + ((isSetValidated()) ? 131071 : 524287);
++ if (isSetValidated())
++ hashCode = hashCode * 8191 + ((validated) ? 131071 : 524287);
++
+ return hashCode;
}
@Override
@@@ -903,6 -1008,16 +969,16 @@@
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetValidated()).compareTo(other.isSetValidated());
++ lastComparison = java.lang.Boolean.valueOf(isSetValidated()).compareTo(other.isSetValidated());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetValidated()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validated, other.validated);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@@ -1296,10 -1436,10 +1397,10 @@@
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, UserComputeResourcePreference struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.computeResourceId = iprot.readString();
struct.setComputeResourceIdIsSet(true);
- java.util.BitSet incoming = iprot.readBitSet(9);
- BitSet incoming = iprot.readBitSet(10);
++ java.util.BitSet incoming = iprot.readBitSet(10);
if (incoming.get(0)) {
struct.loginUserName = iprot.readString();
struct.setLoginUserNameIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebdf8977/pom.xml
----------------------------------------------------------------------