http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/TenantApprovalStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/TenantApprovalStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/TenantApprovalStatus.java new file mode 100644 index 0000000..4c43d6f --- /dev/null +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/TenantApprovalStatus.java @@ -0,0 +1,77 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Autogenerated by Thrift Compiler (0.9.3) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.apache.airavata.model.tenant; + + +import java.util.Map; +import java.util.HashMap; +import org.apache.thrift.TEnum; + +public enum TenantApprovalStatus implements org.apache.thrift.TEnum { + REQUESTED(0), + APPROVED(1), + ACTIVE(2), + DEACTIVATED(3), + CANCELLED(4), + DENIED(5), + CREATED(6); + + private final int value; + + private TenantApprovalStatus(int value) { + this.value = value; + } + + /** + * Get the integer value of this enum value, as defined in the Thrift IDL. + */ + public int getValue() { + return value; + } + + /** + * Find a the enum type by its integer value, as defined in the Thrift IDL. + * @return null if the value is not found. + */ + public static TenantApprovalStatus findByValue(int value) { + switch (value) { + case 0: + return REQUESTED; + case 1: + return APPROVED; + case 2: + return ACTIVE; + case 3: + return DEACTIVATED; + case 4: + return CANCELLED; + case 5: + return DENIED; + case 6: + return CREATED; + default: + return null; + } + } +}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java index e335716..b01ab6a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java index 17ba411..8360fe9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java index 3f30db8..231654b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java index 9d0e42f..7c6fd74 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * @@ -74,6 +72,12 @@ import org.slf4j.LoggerFactory; * * Externally assertable unique identifier. SAML (primarly in higher education, academic) tends to keep * * user name less opaque. OpenID Connect maintains them to be opaque. * * + * * firstName, middleName, lastName: + * * First and Last names as assertede by the user + * * + * * namePrefix, nameSuffix: + * * prefix and suffix to the users name as asserted by the user + * * * * emails: * * Email identifier are Verified, REQUIRED and MULTIVALUED * * @@ -114,22 +118,27 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)3); 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)4); private static final org.apache.thrift.protocol.TField EMAILS_FIELD_DESC = new org.apache.thrift.protocol.TField("emails", org.apache.thrift.protocol.TType.LIST, (short)5); - private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)6); - private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orcidId", org.apache.thrift.protocol.TType.STRING, (short)7); - private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = new org.apache.thrift.protocol.TField("phones", org.apache.thrift.protocol.TType.LIST, (short)8); - private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("country", org.apache.thrift.protocol.TType.STRING, (short)9); - private static final org.apache.thrift.protocol.TField NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", org.apache.thrift.protocol.TType.LIST, (short)10); - private static final org.apache.thrift.protocol.TField HOME_ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("homeOrganization", org.apache.thrift.protocol.TType.STRING, (short)11); - private static final org.apache.thrift.protocol.TField ORGINATION_AFFILIATION_FIELD_DESC = new org.apache.thrift.protocol.TField("orginationAffiliation", org.apache.thrift.protocol.TType.STRING, (short)12); - private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)13); - private static final org.apache.thrift.protocol.TField LAST_ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastAccessTime", org.apache.thrift.protocol.TType.I64, (short)14); - private static final org.apache.thrift.protocol.TField VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", org.apache.thrift.protocol.TType.I64, (short)15); - private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("State", org.apache.thrift.protocol.TType.I32, (short)16); - private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("comments", org.apache.thrift.protocol.TType.STRING, (short)17); - private static final org.apache.thrift.protocol.TField LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", org.apache.thrift.protocol.TType.LIST, (short)18); - private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("gpgKey", org.apache.thrift.protocol.TType.STRING, (short)19); - private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeZone", org.apache.thrift.protocol.TType.STRING, (short)20); - private static final org.apache.thrift.protocol.TField NSF_DEMOGRAPHICS_FIELD_DESC = new org.apache.thrift.protocol.TField("nsfDemographics", org.apache.thrift.protocol.TType.STRUCT, (short)21); + private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField MIDDLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("middleName", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField NAME_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("namePrefix", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField NAME_SUFFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("nameSuffix", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)11); + private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orcidId", org.apache.thrift.protocol.TType.STRING, (short)12); + private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = new org.apache.thrift.protocol.TField("phones", org.apache.thrift.protocol.TType.LIST, (short)13); + private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("country", org.apache.thrift.protocol.TType.STRING, (short)14); + private static final org.apache.thrift.protocol.TField NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", org.apache.thrift.protocol.TType.LIST, (short)15); + private static final org.apache.thrift.protocol.TField HOME_ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("homeOrganization", org.apache.thrift.protocol.TType.STRING, (short)16); + private static final org.apache.thrift.protocol.TField ORGINATION_AFFILIATION_FIELD_DESC = new org.apache.thrift.protocol.TField("orginationAffiliation", org.apache.thrift.protocol.TType.STRING, (short)17); + private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)18); + private static final org.apache.thrift.protocol.TField LAST_ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastAccessTime", org.apache.thrift.protocol.TType.I64, (short)19); + private static final org.apache.thrift.protocol.TField VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", org.apache.thrift.protocol.TType.I64, (short)20); + private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("State", org.apache.thrift.protocol.TType.I32, (short)21); + private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("comments", org.apache.thrift.protocol.TType.STRING, (short)22); + private static final org.apache.thrift.protocol.TField LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", org.apache.thrift.protocol.TType.LIST, (short)23); + private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("gpgKey", org.apache.thrift.protocol.TType.STRING, (short)24); + private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeZone", org.apache.thrift.protocol.TType.STRING, (short)25); + private static final org.apache.thrift.protocol.TField NSF_DEMOGRAPHICS_FIELD_DESC = new org.apache.thrift.protocol.TField("nsfDemographics", org.apache.thrift.protocol.TType.STRUCT, (short)26); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -142,6 +151,11 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro private String userId; // required private String gatewayId; // required private List<String> emails; // required + private String firstName; // required + private String lastName; // required + private String middleName; // optional + private String namePrefix; // optional + private String nameSuffix; // optional private String userName; // optional private String orcidId; // optional private List<String> phones; // optional @@ -166,26 +180,31 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro USER_ID((short)3, "userId"), GATEWAY_ID((short)4, "gatewayId"), EMAILS((short)5, "emails"), - USER_NAME((short)6, "userName"), - ORCID_ID((short)7, "orcidId"), - PHONES((short)8, "phones"), - COUNTRY((short)9, "country"), - NATIONALITY((short)10, "nationality"), - HOME_ORGANIZATION((short)11, "homeOrganization"), - ORGINATION_AFFILIATION((short)12, "orginationAffiliation"), - CREATION_TIME((short)13, "creationTime"), - LAST_ACCESS_TIME((short)14, "lastAccessTime"), - VALID_UNTIL((short)15, "validUntil"), + FIRST_NAME((short)6, "firstName"), + LAST_NAME((short)7, "lastName"), + MIDDLE_NAME((short)8, "middleName"), + NAME_PREFIX((short)9, "namePrefix"), + NAME_SUFFIX((short)10, "nameSuffix"), + USER_NAME((short)11, "userName"), + ORCID_ID((short)12, "orcidId"), + PHONES((short)13, "phones"), + COUNTRY((short)14, "country"), + NATIONALITY((short)15, "nationality"), + HOME_ORGANIZATION((short)16, "homeOrganization"), + ORGINATION_AFFILIATION((short)17, "orginationAffiliation"), + CREATION_TIME((short)18, "creationTime"), + LAST_ACCESS_TIME((short)19, "lastAccessTime"), + VALID_UNTIL((short)20, "validUntil"), /** * * @see Status */ - STATE((short)16, "State"), - COMMENTS((short)17, "comments"), - LABELED_URI((short)18, "labeledURI"), - GPG_KEY((short)19, "gpgKey"), - TIME_ZONE((short)20, "timeZone"), - NSF_DEMOGRAPHICS((short)21, "nsfDemographics"); + STATE((short)21, "State"), + COMMENTS((short)22, "comments"), + LABELED_URI((short)23, "labeledURI"), + GPG_KEY((short)24, "gpgKey"), + TIME_ZONE((short)25, "timeZone"), + NSF_DEMOGRAPHICS((short)26, "nsfDemographics"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -210,37 +229,47 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro return GATEWAY_ID; case 5: // EMAILS return EMAILS; - case 6: // USER_NAME + case 6: // FIRST_NAME + return FIRST_NAME; + case 7: // LAST_NAME + return LAST_NAME; + case 8: // MIDDLE_NAME + return MIDDLE_NAME; + case 9: // NAME_PREFIX + return NAME_PREFIX; + case 10: // NAME_SUFFIX + return NAME_SUFFIX; + case 11: // USER_NAME return USER_NAME; - case 7: // ORCID_ID + case 12: // ORCID_ID return ORCID_ID; - case 8: // PHONES + case 13: // PHONES return PHONES; - case 9: // COUNTRY + case 14: // COUNTRY return COUNTRY; - case 10: // NATIONALITY + case 15: // NATIONALITY return NATIONALITY; - case 11: // HOME_ORGANIZATION + case 16: // HOME_ORGANIZATION return HOME_ORGANIZATION; - case 12: // ORGINATION_AFFILIATION + case 17: // ORGINATION_AFFILIATION return ORGINATION_AFFILIATION; - case 13: // CREATION_TIME + case 18: // CREATION_TIME return CREATION_TIME; - case 14: // LAST_ACCESS_TIME + case 19: // LAST_ACCESS_TIME return LAST_ACCESS_TIME; - case 15: // VALID_UNTIL + case 20: // VALID_UNTIL return VALID_UNTIL; - case 16: // STATE + case 21: // STATE return STATE; - case 17: // COMMENTS + case 22: // COMMENTS return COMMENTS; - case 18: // LABELED_URI + case 23: // LABELED_URI return LABELED_URI; - case 19: // GPG_KEY + case 24: // GPG_KEY return GPG_KEY; - case 20: // TIME_ZONE + case 25: // TIME_ZONE return TIME_ZONE; - case 21: // NSF_DEMOGRAPHICS + case 26: // NSF_DEMOGRAPHICS return NSF_DEMOGRAPHICS; default: return null; @@ -286,7 +315,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro private static final int __LASTACCESSTIME_ISSET_ID = 1; private static final int __VALIDUNTIL_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.USER_NAME,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS}; + private static final _Fields optionals[] = {_Fields.MIDDLE_NAME,_Fields.NAME_PREFIX,_Fields.NAME_SUFFIX,_Fields.USER_NAME,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS}; 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); @@ -301,6 +330,16 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro tmpMap.put(_Fields.EMAILS, new org.apache.thrift.meta_data.FieldMetaData("emails", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("lastName", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.MIDDLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("middleName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.NAME_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("namePrefix", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.NAME_SUFFIX, new org.apache.thrift.meta_data.FieldMetaData("nameSuffix", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.ORCID_ID, new org.apache.thrift.meta_data.FieldMetaData("orcidId", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -353,6 +392,8 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro String userId, String gatewayId, List<String> emails, + String firstName, + String lastName, long creationTime, long lastAccessTime, long validUntil, @@ -364,6 +405,8 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro this.userId = userId; this.gatewayId = gatewayId; this.emails = emails; + this.firstName = firstName; + this.lastName = lastName; this.creationTime = creationTime; setCreationTimeIsSet(true); this.lastAccessTime = lastAccessTime; @@ -394,6 +437,21 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro List<String> __this__emails = new ArrayList<String>(other.emails); this.emails = __this__emails; } + if (other.isSetFirstName()) { + this.firstName = other.firstName; + } + if (other.isSetLastName()) { + this.lastName = other.lastName; + } + if (other.isSetMiddleName()) { + this.middleName = other.middleName; + } + if (other.isSetNamePrefix()) { + this.namePrefix = other.namePrefix; + } + if (other.isSetNameSuffix()) { + this.nameSuffix = other.nameSuffix; + } if (other.isSetUserName()) { this.userName = other.userName; } @@ -454,6 +512,11 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro this.userId = null; this.gatewayId = null; this.emails = null; + this.firstName = null; + this.lastName = null; + this.middleName = null; + this.namePrefix = null; + this.nameSuffix = null; this.userName = null; this.orcidId = null; this.phones = null; @@ -605,6 +668,121 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro } } + public String getFirstName() { + return this.firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public void unsetFirstName() { + this.firstName = null; + } + + /** Returns true if field firstName is set (has been assigned a value) and false otherwise */ + public boolean isSetFirstName() { + return this.firstName != null; + } + + public void setFirstNameIsSet(boolean value) { + if (!value) { + this.firstName = null; + } + } + + public String getLastName() { + return this.lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public void unsetLastName() { + this.lastName = null; + } + + /** Returns true if field lastName is set (has been assigned a value) and false otherwise */ + public boolean isSetLastName() { + return this.lastName != null; + } + + public void setLastNameIsSet(boolean value) { + if (!value) { + this.lastName = null; + } + } + + public String getMiddleName() { + return this.middleName; + } + + public void setMiddleName(String middleName) { + this.middleName = middleName; + } + + public void unsetMiddleName() { + this.middleName = null; + } + + /** Returns true if field middleName is set (has been assigned a value) and false otherwise */ + public boolean isSetMiddleName() { + return this.middleName != null; + } + + public void setMiddleNameIsSet(boolean value) { + if (!value) { + this.middleName = null; + } + } + + public String getNamePrefix() { + return this.namePrefix; + } + + public void setNamePrefix(String namePrefix) { + this.namePrefix = namePrefix; + } + + public void unsetNamePrefix() { + this.namePrefix = null; + } + + /** Returns true if field namePrefix is set (has been assigned a value) and false otherwise */ + public boolean isSetNamePrefix() { + return this.namePrefix != null; + } + + public void setNamePrefixIsSet(boolean value) { + if (!value) { + this.namePrefix = null; + } + } + + public String getNameSuffix() { + return this.nameSuffix; + } + + public void setNameSuffix(String nameSuffix) { + this.nameSuffix = nameSuffix; + } + + public void unsetNameSuffix() { + this.nameSuffix = null; + } + + /** Returns true if field nameSuffix is set (has been assigned a value) and false otherwise */ + public boolean isSetNameSuffix() { + return this.nameSuffix != null; + } + + public void setNameSuffixIsSet(boolean value) { + if (!value) { + this.nameSuffix = null; + } + } + public String getUserName() { return this.userName; } @@ -1065,6 +1243,46 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro } break; + case FIRST_NAME: + if (value == null) { + unsetFirstName(); + } else { + setFirstName((String)value); + } + break; + + case LAST_NAME: + if (value == null) { + unsetLastName(); + } else { + setLastName((String)value); + } + break; + + case MIDDLE_NAME: + if (value == null) { + unsetMiddleName(); + } else { + setMiddleName((String)value); + } + break; + + case NAME_PREFIX: + if (value == null) { + unsetNamePrefix(); + } else { + setNamePrefix((String)value); + } + break; + + case NAME_SUFFIX: + if (value == null) { + unsetNameSuffix(); + } else { + setNameSuffix((String)value); + } + break; + case USER_NAME: if (value == null) { unsetUserName(); @@ -1213,6 +1431,21 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro case EMAILS: return getEmails(); + case FIRST_NAME: + return getFirstName(); + + case LAST_NAME: + return getLastName(); + + case MIDDLE_NAME: + return getMiddleName(); + + case NAME_PREFIX: + return getNamePrefix(); + + case NAME_SUFFIX: + return getNameSuffix(); + case USER_NAME: return getUserName(); @@ -1282,6 +1515,16 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro return isSetGatewayId(); case EMAILS: return isSetEmails(); + case FIRST_NAME: + return isSetFirstName(); + case LAST_NAME: + return isSetLastName(); + case MIDDLE_NAME: + return isSetMiddleName(); + case NAME_PREFIX: + return isSetNamePrefix(); + case NAME_SUFFIX: + return isSetNameSuffix(); case USER_NAME: return isSetUserName(); case ORCID_ID: @@ -1376,6 +1619,51 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro return false; } + boolean this_present_firstName = true && this.isSetFirstName(); + boolean that_present_firstName = true && that.isSetFirstName(); + if (this_present_firstName || that_present_firstName) { + if (!(this_present_firstName && that_present_firstName)) + return false; + if (!this.firstName.equals(that.firstName)) + return false; + } + + boolean this_present_lastName = true && this.isSetLastName(); + boolean that_present_lastName = true && that.isSetLastName(); + if (this_present_lastName || that_present_lastName) { + if (!(this_present_lastName && that_present_lastName)) + return false; + if (!this.lastName.equals(that.lastName)) + return false; + } + + boolean this_present_middleName = true && this.isSetMiddleName(); + boolean that_present_middleName = true && that.isSetMiddleName(); + if (this_present_middleName || that_present_middleName) { + if (!(this_present_middleName && that_present_middleName)) + return false; + if (!this.middleName.equals(that.middleName)) + return false; + } + + boolean this_present_namePrefix = true && this.isSetNamePrefix(); + boolean that_present_namePrefix = true && that.isSetNamePrefix(); + if (this_present_namePrefix || that_present_namePrefix) { + if (!(this_present_namePrefix && that_present_namePrefix)) + return false; + if (!this.namePrefix.equals(that.namePrefix)) + return false; + } + + boolean this_present_nameSuffix = true && this.isSetNameSuffix(); + boolean that_present_nameSuffix = true && that.isSetNameSuffix(); + if (this_present_nameSuffix || that_present_nameSuffix) { + if (!(this_present_nameSuffix && that_present_nameSuffix)) + return false; + if (!this.nameSuffix.equals(that.nameSuffix)) + return false; + } + boolean this_present_userName = true && this.isSetUserName(); boolean that_present_userName = true && that.isSetUserName(); if (this_present_userName || that_present_userName) { @@ -1552,6 +1840,31 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro if (present_emails) list.add(emails); + boolean present_firstName = true && (isSetFirstName()); + list.add(present_firstName); + if (present_firstName) + list.add(firstName); + + boolean present_lastName = true && (isSetLastName()); + list.add(present_lastName); + if (present_lastName) + list.add(lastName); + + boolean present_middleName = true && (isSetMiddleName()); + list.add(present_middleName); + if (present_middleName) + list.add(middleName); + + boolean present_namePrefix = true && (isSetNamePrefix()); + list.add(present_namePrefix); + if (present_namePrefix) + list.add(namePrefix); + + boolean present_nameSuffix = true && (isSetNameSuffix()); + list.add(present_nameSuffix); + if (present_nameSuffix) + list.add(nameSuffix); + boolean present_userName = true && (isSetUserName()); list.add(present_userName); if (present_userName) @@ -1693,6 +2006,56 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro return lastComparison; } } + lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFirstName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLastName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetMiddleName()).compareTo(other.isSetMiddleName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetMiddleName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.middleName, other.middleName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetNamePrefix()).compareTo(other.isSetNamePrefix()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNamePrefix()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.namePrefix, other.namePrefix); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetNameSuffix()).compareTo(other.isSetNameSuffix()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNameSuffix()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nameSuffix, other.nameSuffix); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetUserName()).compareTo(other.isSetUserName()); if (lastComparison != 0) { return lastComparison; @@ -1912,6 +2275,52 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro sb.append(this.emails); } first = false; + if (!first) sb.append(", "); + sb.append("firstName:"); + if (this.firstName == null) { + sb.append("null"); + } else { + sb.append(this.firstName); + } + first = false; + if (!first) sb.append(", "); + sb.append("lastName:"); + if (this.lastName == null) { + sb.append("null"); + } else { + sb.append(this.lastName); + } + first = false; + if (isSetMiddleName()) { + if (!first) sb.append(", "); + sb.append("middleName:"); + if (this.middleName == null) { + sb.append("null"); + } else { + sb.append(this.middleName); + } + first = false; + } + if (isSetNamePrefix()) { + if (!first) sb.append(", "); + sb.append("namePrefix:"); + if (this.namePrefix == null) { + sb.append("null"); + } else { + sb.append(this.namePrefix); + } + first = false; + } + if (isSetNameSuffix()) { + if (!first) sb.append(", "); + sb.append("nameSuffix:"); + if (this.nameSuffix == null) { + sb.append("null"); + } else { + sb.append(this.nameSuffix); + } + first = false; + } if (isSetUserName()) { if (!first) sb.append(", "); sb.append("userName:"); @@ -2078,6 +2487,14 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro throw new org.apache.thrift.protocol.TProtocolException("Required field 'emails' is unset! Struct:" + toString()); } + if (!isSetFirstName()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'firstName' is unset! Struct:" + toString()); + } + + if (!isSetLastName()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'lastName' is unset! Struct:" + toString()); + } + if (!isSetCreationTime()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'creationTime' is unset! Struct:" + toString()); } @@ -2186,7 +2603,47 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // USER_NAME + case 6: // FIRST_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.firstName = iprot.readString(); + struct.setFirstNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 7: // LAST_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.lastName = iprot.readString(); + struct.setLastNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 8: // MIDDLE_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.middleName = iprot.readString(); + struct.setMiddleNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 9: // NAME_PREFIX + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.namePrefix = iprot.readString(); + struct.setNamePrefixIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 10: // NAME_SUFFIX + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.nameSuffix = iprot.readString(); + struct.setNameSuffixIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 11: // USER_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userName = iprot.readString(); struct.setUserNameIsSet(true); @@ -2194,7 +2651,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // ORCID_ID + case 12: // ORCID_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.orcidId = iprot.readString(); struct.setOrcidIdIsSet(true); @@ -2202,7 +2659,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // PHONES + case 13: // PHONES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list27 = iprot.readListBegin(); @@ -2220,7 +2677,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 9: // COUNTRY + case 14: // COUNTRY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.country = iprot.readString(); struct.setCountryIsSet(true); @@ -2228,7 +2685,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 10: // NATIONALITY + case 15: // NATIONALITY if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list30 = iprot.readListBegin(); @@ -2246,7 +2703,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 11: // HOME_ORGANIZATION + case 16: // HOME_ORGANIZATION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.homeOrganization = iprot.readString(); struct.setHomeOrganizationIsSet(true); @@ -2254,7 +2711,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 12: // ORGINATION_AFFILIATION + case 17: // ORGINATION_AFFILIATION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.orginationAffiliation = iprot.readString(); struct.setOrginationAffiliationIsSet(true); @@ -2262,7 +2719,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 13: // CREATION_TIME + case 18: // CREATION_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.creationTime = iprot.readI64(); struct.setCreationTimeIsSet(true); @@ -2270,7 +2727,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 14: // LAST_ACCESS_TIME + case 19: // LAST_ACCESS_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.lastAccessTime = iprot.readI64(); struct.setLastAccessTimeIsSet(true); @@ -2278,7 +2735,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 15: // VALID_UNTIL + case 20: // VALID_UNTIL if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.validUntil = iprot.readI64(); struct.setValidUntilIsSet(true); @@ -2286,7 +2743,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 16: // STATE + case 21: // STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.State = org.apache.airavata.model.user.Status.findByValue(iprot.readI32()); struct.setStateIsSet(true); @@ -2294,7 +2751,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 17: // COMMENTS + case 22: // COMMENTS if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.comments = iprot.readString(); struct.setCommentsIsSet(true); @@ -2302,7 +2759,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 18: // LABELED_URI + case 23: // LABELED_URI if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list33 = iprot.readListBegin(); @@ -2320,7 +2777,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 19: // GPG_KEY + case 24: // GPG_KEY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.gpgKey = iprot.readString(); struct.setGpgKeyIsSet(true); @@ -2328,7 +2785,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 20: // TIME_ZONE + case 25: // TIME_ZONE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.timeZone = iprot.readString(); struct.setTimeZoneIsSet(true); @@ -2336,7 +2793,7 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 21: // NSF_DEMOGRAPHICS + case 26: // NSF_DEMOGRAPHICS if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.nsfDemographics = new NSFDemographics(); struct.nsfDemographics.read(iprot); @@ -2390,6 +2847,37 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro } oprot.writeFieldEnd(); } + if (struct.firstName != null) { + oprot.writeFieldBegin(FIRST_NAME_FIELD_DESC); + oprot.writeString(struct.firstName); + oprot.writeFieldEnd(); + } + if (struct.lastName != null) { + oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); + oprot.writeString(struct.lastName); + oprot.writeFieldEnd(); + } + if (struct.middleName != null) { + if (struct.isSetMiddleName()) { + oprot.writeFieldBegin(MIDDLE_NAME_FIELD_DESC); + oprot.writeString(struct.middleName); + oprot.writeFieldEnd(); + } + } + if (struct.namePrefix != null) { + if (struct.isSetNamePrefix()) { + oprot.writeFieldBegin(NAME_PREFIX_FIELD_DESC); + oprot.writeString(struct.namePrefix); + oprot.writeFieldEnd(); + } + } + if (struct.nameSuffix != null) { + if (struct.isSetNameSuffix()) { + oprot.writeFieldBegin(NAME_SUFFIX_FIELD_DESC); + oprot.writeString(struct.nameSuffix); + oprot.writeFieldEnd(); + } + } if (struct.userName != null) { if (struct.isSetUserName()) { oprot.writeFieldBegin(USER_NAME_FIELD_DESC); @@ -2537,48 +3025,68 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro oprot.writeString(_iter40); } } + oprot.writeString(struct.firstName); + oprot.writeString(struct.lastName); oprot.writeI64(struct.creationTime); oprot.writeI64(struct.lastAccessTime); oprot.writeI64(struct.validUntil); oprot.writeI32(struct.State.getValue()); BitSet optionals = new BitSet(); - if (struct.isSetUserName()) { + if (struct.isSetMiddleName()) { optionals.set(0); } - if (struct.isSetOrcidId()) { + if (struct.isSetNamePrefix()) { optionals.set(1); } - if (struct.isSetPhones()) { + if (struct.isSetNameSuffix()) { optionals.set(2); } - if (struct.isSetCountry()) { + if (struct.isSetUserName()) { optionals.set(3); } - if (struct.isSetNationality()) { + if (struct.isSetOrcidId()) { optionals.set(4); } - if (struct.isSetHomeOrganization()) { + if (struct.isSetPhones()) { optionals.set(5); } - if (struct.isSetOrginationAffiliation()) { + if (struct.isSetCountry()) { optionals.set(6); } - if (struct.isSetComments()) { + if (struct.isSetNationality()) { optionals.set(7); } - if (struct.isSetLabeledURI()) { + if (struct.isSetHomeOrganization()) { optionals.set(8); } - if (struct.isSetGpgKey()) { + if (struct.isSetOrginationAffiliation()) { optionals.set(9); } - if (struct.isSetTimeZone()) { + if (struct.isSetComments()) { optionals.set(10); } - if (struct.isSetNsfDemographics()) { + if (struct.isSetLabeledURI()) { optionals.set(11); } - oprot.writeBitSet(optionals, 12); + if (struct.isSetGpgKey()) { + optionals.set(12); + } + if (struct.isSetTimeZone()) { + optionals.set(13); + } + if (struct.isSetNsfDemographics()) { + optionals.set(14); + } + oprot.writeBitSet(optionals, 15); + if (struct.isSetMiddleName()) { + oprot.writeString(struct.middleName); + } + if (struct.isSetNamePrefix()) { + oprot.writeString(struct.namePrefix); + } + if (struct.isSetNameSuffix()) { + oprot.writeString(struct.nameSuffix); + } if (struct.isSetUserName()) { oprot.writeString(struct.userName); } @@ -2657,6 +3165,10 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro } } struct.setEmailsIsSet(true); + struct.firstName = iprot.readString(); + struct.setFirstNameIsSet(true); + struct.lastName = iprot.readString(); + struct.setLastNameIsSet(true); struct.creationTime = iprot.readI64(); struct.setCreationTimeIsSet(true); struct.lastAccessTime = iprot.readI64(); @@ -2665,16 +3177,28 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro struct.setValidUntilIsSet(true); struct.State = org.apache.airavata.model.user.Status.findByValue(iprot.readI32()); struct.setStateIsSet(true); - BitSet incoming = iprot.readBitSet(12); + BitSet incoming = iprot.readBitSet(15); if (incoming.get(0)) { + struct.middleName = iprot.readString(); + struct.setMiddleNameIsSet(true); + } + if (incoming.get(1)) { + struct.namePrefix = iprot.readString(); + struct.setNamePrefixIsSet(true); + } + if (incoming.get(2)) { + struct.nameSuffix = iprot.readString(); + struct.setNameSuffixIsSet(true); + } + if (incoming.get(3)) { struct.userName = iprot.readString(); struct.setUserNameIsSet(true); } - if (incoming.get(1)) { + if (incoming.get(4)) { struct.orcidId = iprot.readString(); struct.setOrcidIdIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(5)) { { org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.phones = new ArrayList<String>(_list47.size); @@ -2687,11 +3211,11 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro } struct.setPhonesIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(6)) { struct.country = iprot.readString(); struct.setCountryIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(7)) { { org.apache.thrift.protocol.TList _list50 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.nationality = new ArrayList<String>(_list50.size); @@ -2704,19 +3228,19 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro } struct.setNationalityIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(8)) { struct.homeOrganization = iprot.readString(); struct.setHomeOrganizationIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(9)) { struct.orginationAffiliation = iprot.readString(); struct.setOrginationAffiliationIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(10)) { struct.comments = iprot.readString(); struct.setCommentsIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(11)) { { org.apache.thrift.protocol.TList _list53 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.labeledURI = new ArrayList<String>(_list53.size); @@ -2729,15 +3253,15 @@ public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserPro } struct.setLabeledURIIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(12)) { struct.gpgKey = iprot.readString(); struct.setGpgKeyIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(13)) { struct.timeZone = iprot.readString(); struct.setTimeZoneIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(14)) { struct.nsfDemographics = new NSFDemographics(); struct.nsfDemographics.read(iprot); struct.setNsfDemographicsIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java index cc6dd0c..de4077c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java index d9462ba..aaf005b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java index fef5da6..dbf1cac 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java index 91f5425..37b47a8 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java index 2018124..c32cc0d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java index 2a47b1a..e53ee20 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java index e765ab7..f1bf76f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java index 65dc1da..bebdca6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/NotificationPriority.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/NotificationPriority.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/NotificationPriority.java index 4b0c11e..90c56be 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/NotificationPriority.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/NotificationPriority.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java index d01c743..275c199 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java index e26a269..e0cfcc2 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java @@ -1,22 +1,20 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/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 34ef441..e952abb 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -43,8 +43,8 @@ include "../data-models/resource-catalog-models/user_resource_profile_model.thri include "../data-models/resource-catalog-models/data_movement_models.thrift" include "../data-models/workflow-models/workflow_data_model.thrift" include "../data-models/replica-catalog-models/replica_catalog_models.thrift" -include "../data-models/user-group-models/group_manager_model.thrift" -include "../data-models/user-group-models/user_profile_model.thrift" +include "../data-models/user-tenant-group-models/group_manager_model.thrift" +include "../data-models/user-tenant-group-models/user_profile_model.thrift" namespace java org.apache.airavata.api namespace php Airavata.API http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/thrift-interface-descriptions/component-cpis/registry-api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/component-cpis/registry-api.thrift b/thrift-interface-descriptions/component-cpis/registry-api.thrift index 004919a..cd3248f 100644 --- a/thrift-interface-descriptions/component-cpis/registry-api.thrift +++ b/thrift-interface-descriptions/component-cpis/registry-api.thrift @@ -24,7 +24,7 @@ */ include "../data-models/airavata_data_models.thrift" -include "../data-models/user-group-models/user_profile_model.thrift" +include "../data-models/user-tenant-group-models/user_profile_model.thrift" include "../data-models/experiment-catalog-models/status_models.thrift" include "../data-models/experiment-catalog-models/job_model.thrift" include "../data-models/experiment-catalog-models/experiment_model.thrift" http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/thrift-interface-descriptions/component-cpis/user-profile-cpi.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/component-cpis/user-profile-cpi.thrift b/thrift-interface-descriptions/component-cpis/user-profile-cpi.thrift index 739ea1c..9567bf0 100644 --- a/thrift-interface-descriptions/component-cpis/user-profile-cpi.thrift +++ b/thrift-interface-descriptions/component-cpis/user-profile-cpi.thrift @@ -23,7 +23,7 @@ * */ -include "../data-models/user-group-models/user_profile_model.thrift" +include "../data-models/user-tenant-group-models/user_profile_model.thrift" include "user_profile_cpi_errors.thrift"
