Repository: airavata Updated Branches: refs/heads/develop 421a44147 -> c7400a915
http://git-wip-us.apache.org/repos/asf/airavata/blob/c7400a91/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java index 1a529b0..6978767 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java @@ -22,32 +22,15 @@ */ package org.apache.airavata.credential.store.datamodel; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; - import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -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; +import java.util.*; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-01") @@ -55,11 +38,12 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PasswordCredential"); private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField PERSISTED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("persistedTime", org.apache.thrift.protocol.TType.I64, (short)5); - private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField PORTAL_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("portalUserName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField LOGIN_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("loginUserName", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField PERSISTED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("persistedTime", org.apache.thrift.protocol.TType.I64, (short)6); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)7); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -68,7 +52,8 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede } public String gatewayId; // required - public String username; // required + public String portalUserName; // required + public String loginUserName; // required public String password; // required public String description; // optional public long persistedTime; // optional @@ -77,11 +62,12 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { GATEWAY_ID((short)1, "gatewayId"), - USERNAME((short)2, "username"), - PASSWORD((short)3, "password"), - DESCRIPTION((short)4, "description"), - PERSISTED_TIME((short)5, "persistedTime"), - TOKEN((short)6, "token"); + PORTAL_USER_NAME((short)2, "portalUserName"), + LOGIN_USER_NAME((short)3, "loginUserName"), + PASSWORD((short)4, "password"), + DESCRIPTION((short)5, "description"), + PERSISTED_TIME((short)6, "persistedTime"), + TOKEN((short)7, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -98,15 +84,17 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede switch(fieldId) { case 1: // GATEWAY_ID return GATEWAY_ID; - case 2: // USERNAME - return USERNAME; - case 3: // PASSWORD + case 2: // PORTAL_USER_NAME + return PORTAL_USER_NAME; + case 3: // LOGIN_USER_NAME + return LOGIN_USER_NAME; + case 4: // PASSWORD return PASSWORD; - case 4: // DESCRIPTION + case 5: // DESCRIPTION return DESCRIPTION; - case 5: // PERSISTED_TIME + case 6: // PERSISTED_TIME return PERSISTED_TIME; - case 6: // TOKEN + case 7: // TOKEN return TOKEN; default: return null; @@ -156,7 +144,9 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.PORTAL_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("portalUserName", 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.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("password", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); @@ -175,12 +165,14 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede public PasswordCredential( String gatewayId, - String username, + String portalUserName, + String loginUserName, String password) { this(); this.gatewayId = gatewayId; - this.username = username; + this.portalUserName = portalUserName; + this.loginUserName = loginUserName; this.password = password; } @@ -192,8 +184,11 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede if (other.isSetGatewayId()) { this.gatewayId = other.gatewayId; } - if (other.isSetUsername()) { - this.username = other.username; + if (other.isSetPortalUserName()) { + this.portalUserName = other.portalUserName; + } + if (other.isSetLoginUserName()) { + this.loginUserName = other.loginUserName; } if (other.isSetPassword()) { this.password = other.password; @@ -214,7 +209,8 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede @Override public void clear() { this.gatewayId = null; - this.username = null; + this.portalUserName = null; + this.loginUserName = null; this.password = null; this.description = null; setPersistedTimeIsSet(false); @@ -246,27 +242,51 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede } } - public String getUsername() { - return this.username; + public String getPortalUserName() { + return this.portalUserName; + } + + public PasswordCredential setPortalUserName(String portalUserName) { + this.portalUserName = portalUserName; + return this; + } + + public void unsetPortalUserName() { + this.portalUserName = null; + } + + /** Returns true if field portalUserName is set (has been assigned a value) and false otherwise */ + public boolean isSetPortalUserName() { + return this.portalUserName != null; + } + + public void setPortalUserNameIsSet(boolean value) { + if (!value) { + this.portalUserName = null; + } + } + + public String getLoginUserName() { + return this.loginUserName; } - public PasswordCredential setUsername(String username) { - this.username = username; + public PasswordCredential setLoginUserName(String loginUserName) { + this.loginUserName = loginUserName; return this; } - public void unsetUsername() { - this.username = null; + public void unsetLoginUserName() { + this.loginUserName = null; } - /** Returns true if field username is set (has been assigned a value) and false otherwise */ - public boolean isSetUsername() { - return this.username != null; + /** Returns true if field loginUserName is set (has been assigned a value) and false otherwise */ + public boolean isSetLoginUserName() { + return this.loginUserName != null; } - public void setUsernameIsSet(boolean value) { + public void setLoginUserNameIsSet(boolean value) { if (!value) { - this.username = null; + this.loginUserName = null; } } @@ -375,11 +395,19 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede } break; - case USERNAME: + case PORTAL_USER_NAME: + if (value == null) { + unsetPortalUserName(); + } else { + setPortalUserName((String)value); + } + break; + + case LOGIN_USER_NAME: if (value == null) { - unsetUsername(); + unsetLoginUserName(); } else { - setUsername((String)value); + setLoginUserName((String)value); } break; @@ -423,8 +451,11 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede case GATEWAY_ID: return getGatewayId(); - case USERNAME: - return getUsername(); + case PORTAL_USER_NAME: + return getPortalUserName(); + + case LOGIN_USER_NAME: + return getLoginUserName(); case PASSWORD: return getPassword(); @@ -451,8 +482,10 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede switch (field) { case GATEWAY_ID: return isSetGatewayId(); - case USERNAME: - return isSetUsername(); + case PORTAL_USER_NAME: + return isSetPortalUserName(); + case LOGIN_USER_NAME: + return isSetLoginUserName(); case PASSWORD: return isSetPassword(); case DESCRIPTION: @@ -487,12 +520,21 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede return false; } - boolean this_present_username = true && this.isSetUsername(); - boolean that_present_username = true && that.isSetUsername(); - if (this_present_username || that_present_username) { - if (!(this_present_username && that_present_username)) + boolean this_present_portalUserName = true && this.isSetPortalUserName(); + boolean that_present_portalUserName = true && that.isSetPortalUserName(); + if (this_present_portalUserName || that_present_portalUserName) { + if (!(this_present_portalUserName && that_present_portalUserName)) return false; - if (!this.username.equals(that.username)) + if (!this.portalUserName.equals(that.portalUserName)) + return false; + } + + boolean this_present_loginUserName = true && this.isSetLoginUserName(); + boolean that_present_loginUserName = true && that.isSetLoginUserName(); + if (this_present_loginUserName || that_present_loginUserName) { + if (!(this_present_loginUserName && that_present_loginUserName)) + return false; + if (!this.loginUserName.equals(that.loginUserName)) return false; } @@ -544,10 +586,15 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede if (present_gatewayId) list.add(gatewayId); - boolean present_username = true && (isSetUsername()); - list.add(present_username); - if (present_username) - list.add(username); + boolean present_portalUserName = true && (isSetPortalUserName()); + list.add(present_portalUserName); + if (present_portalUserName) + list.add(portalUserName); + + boolean present_loginUserName = true && (isSetLoginUserName()); + list.add(present_loginUserName); + if (present_loginUserName) + list.add(loginUserName); boolean present_password = true && (isSetPassword()); list.add(present_password); @@ -590,12 +637,22 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername()); + lastComparison = Boolean.valueOf(isSetPortalUserName()).compareTo(other.isSetPortalUserName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetPortalUserName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.portalUserName, other.portalUserName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName()); if (lastComparison != 0) { return lastComparison; } - if (isSetUsername()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username); + if (isSetLoginUserName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loginUserName, other.loginUserName); if (lastComparison != 0) { return lastComparison; } @@ -668,11 +725,19 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede } first = false; if (!first) sb.append(", "); - sb.append("username:"); - if (this.username == null) { + sb.append("portalUserName:"); + if (this.portalUserName == null) { sb.append("null"); } else { - sb.append(this.username); + sb.append(this.portalUserName); + } + first = false; + if (!first) sb.append(", "); + sb.append("loginUserName:"); + if (this.loginUserName == null) { + sb.append("null"); + } else { + sb.append(this.loginUserName); } first = false; if (!first) sb.append(", "); @@ -718,8 +783,11 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede if (gatewayId == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString()); } - if (username == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'username' was not present! Struct: " + toString()); + if (portalUserName == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'portalUserName' was not present! Struct: " + toString()); + } + if (loginUserName == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'loginUserName' was not present! Struct: " + toString()); } if (password == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'password' was not present! Struct: " + toString()); @@ -771,15 +839,23 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // USERNAME + case 2: // PORTAL_USER_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.username = iprot.readString(); - struct.setUsernameIsSet(true); + struct.portalUserName = iprot.readString(); + struct.setPortalUserNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // PASSWORD + case 3: // LOGIN_USER_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.loginUserName = iprot.readString(); + struct.setLoginUserNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // PASSWORD if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.password = iprot.readString(); struct.setPasswordIsSet(true); @@ -787,7 +863,7 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // DESCRIPTION + case 5: // DESCRIPTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.description = iprot.readString(); struct.setDescriptionIsSet(true); @@ -795,7 +871,7 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // PERSISTED_TIME + case 6: // PERSISTED_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.persistedTime = iprot.readI64(); struct.setPersistedTimeIsSet(true); @@ -803,7 +879,7 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // TOKEN + case 7: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.token = iprot.readString(); struct.setTokenIsSet(true); @@ -831,9 +907,14 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede oprot.writeString(struct.gatewayId); oprot.writeFieldEnd(); } - if (struct.username != null) { - oprot.writeFieldBegin(USERNAME_FIELD_DESC); - oprot.writeString(struct.username); + if (struct.portalUserName != null) { + oprot.writeFieldBegin(PORTAL_USER_NAME_FIELD_DESC); + oprot.writeString(struct.portalUserName); + oprot.writeFieldEnd(); + } + if (struct.loginUserName != null) { + oprot.writeFieldBegin(LOGIN_USER_NAME_FIELD_DESC); + oprot.writeString(struct.loginUserName); oprot.writeFieldEnd(); } if (struct.password != null) { @@ -878,7 +959,8 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede public void write(org.apache.thrift.protocol.TProtocol prot, PasswordCredential struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeString(struct.gatewayId); - oprot.writeString(struct.username); + oprot.writeString(struct.portalUserName); + oprot.writeString(struct.loginUserName); oprot.writeString(struct.password); BitSet optionals = new BitSet(); if (struct.isSetDescription()) { @@ -907,8 +989,10 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede TTupleProtocol iprot = (TTupleProtocol) prot; struct.gatewayId = iprot.readString(); struct.setGatewayIdIsSet(true); - struct.username = iprot.readString(); - struct.setUsernameIsSet(true); + struct.portalUserName = iprot.readString(); + struct.setPortalUserNameIsSet(true); + struct.loginUserName = iprot.readString(); + struct.setLoginUserNameIsSet(true); struct.password = iprot.readString(); struct.setPasswordIsSet(true); BitSet incoming = iprot.readBitSet(3); http://git-wip-us.apache.org/repos/asf/airavata/blob/c7400a91/thrift-interface-descriptions/airavata-apis/airavata_api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index fd435dd..3654d2b 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -265,10 +265,12 @@ service Airavata { * @param gatewayId * The identifier for the requested Gateway. * - * @param userName + * @param portalUserName * The User for which the credential should be registered. For community accounts, this user is the name of the * community user name. For computational resources, this user name need not be the same user name on resoruces. * + * @param loginUserName + * * @param password * * @return airavataCredStoreToken @@ -278,8 +280,9 @@ service Airavata { **/ string registerPwdCredential (1: required security_model.AuthzToken authzToken, 2: required string gatewayId, - 3: required string userName, - 4: required string password) + 3: required string portalUserName, + 4: required string loginUserName, + 5: required string password) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase) http://git-wip-us.apache.org/repos/asf/airavata/blob/c7400a91/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift b/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift index 84e5243..ae4d900 100644 --- a/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift +++ b/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift @@ -53,9 +53,10 @@ struct CertificateCredential { struct PasswordCredential { 1: required string gatewayId, - 2: required string username, - 3: required string password, - 4: optional string description, - 5: optional i64 persistedTime, - 6: optional string token + 2: required string portalUserName, + 3: required string loginUserName, + 4: required string password, + 5: optional string description, + 6: optional i64 persistedTime, + 7: optional string token }
