Repository: airavata Updated Branches: refs/heads/develop bff76559e -> 7cb338d6a
adding first name, last name, email and icon to sharing user profile Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7cb338d6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7cb338d6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7cb338d6 Branch: refs/heads/develop Commit: 7cb338d6aaf983e91a4213cde0ee6aa05715e872 Parents: bff7655 Author: scnakandala <supun.nakand...@gmail.com> Authored: Thu Oct 13 13:51:03 2016 -0400 Committer: scnakandala <supun.nakand...@gmail.com> Committed: Thu Oct 13 13:51:03 2016 -0400 ---------------------------------------------------------------------- .../registry/db/entities/SharingUserEntity.java | 34 ++ .../main/resources/sharing-registry-derby.sql | 3 + .../main/resources/sharing-registry-mysql.sql | 3 + .../sharing/registry/models/Domain.java | 2 +- .../sharing/registry/models/Entity.java | 2 +- .../registry/models/EntitySearchField.java | 4 + .../sharing/registry/models/EntityType.java | 2 +- .../registry/models/GroupMembership.java | 2 +- .../sharing/registry/models/PermissionType.java | 2 +- .../sharing/registry/models/SearchCriteria.java | 2 +- .../sharing/registry/models/Sharing.java | 2 +- .../models/SharingRegistryException.java | 2 +- .../airavata/sharing/registry/models/User.java | 387 +++++++++++++++++-- .../sharing/registry/models/UserGroup.java | 2 +- .../service/cpi/GovRegistryService.java | 2 +- .../thrift_models/sharing_models.thrift | 7 +- 16 files changed, 410 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java index 31e6e6e..0d17279 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java @@ -24,6 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.persistence.*; +import java.nio.ByteBuffer; @Entity @Table(name = "SHARING_USER", schema = "") @@ -32,6 +33,9 @@ public class SharingUserEntity { private String userId; private String domainId; private String userName; + private String firstName; + private String lastName; + private ByteBuffer icon; private Long createdTime; private Long updatedTime; @@ -66,6 +70,36 @@ public class SharingUserEntity { } @Basic + @Column(name = "FIRST_NAME") + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + @Basic + @Column(name = "LAST_NAME") + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + @Lob + @Column(name = "ICON") + public ByteBuffer getIcon() { + return icon; + } + + public void setIcon(ByteBuffer icon) { + this.icon = icon; + } + + @Basic @Column(name = "CREATED_TIME") public Long getCreatedTime() { return createdTime; http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql b/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql index 4e0fab3..0e58356 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql +++ b/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql @@ -32,6 +32,9 @@ CREATE TABLE SHARING_USER ( USER_ID VARCHAR(255) NOT NULL, DOMAIN_ID VARCHAR(255) NOT NULL, USER_NAME VARCHAR(255) NOT NULL, + FIRST_NAME VARCHAR (255), + LAST_NAME VARCHAR (255), + ICON BLOB, CREATED_TIME BIGINT NOT NULL, UPDATED_TIME BIGINT NOT NULL, PRIMARY KEY (USER_ID), http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-mysql.sql ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-mysql.sql b/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-mysql.sql index ebb3ec0..78d5d78 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-mysql.sql +++ b/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-mysql.sql @@ -32,6 +32,9 @@ CREATE TABLE SHARING_USER ( USER_ID VARCHAR(255) NOT NULL, DOMAIN_ID VARCHAR(255) NOT NULL, USER_NAME VARCHAR(255) NOT NULL, + FIRST_NAME VARCHAR (255), + LAST_NAME VARCHAR (255), + ICON BLOB, CREATED_TIME BIGINT NOT NULL, UPDATED_TIME BIGINT NOT NULL, PRIMARY KEY (USER_ID), http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java index f3b5d25..238ee80 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class Domain implements org.apache.thrift.TBase<Domain, Domain._Fields>, java.io.Serializable, Cloneable, Comparable<Domain> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Domain"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java index 6f169aa..35748f7 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class Entity implements org.apache.thrift.TBase<Entity, Entity._Fields>, java.io.Serializable, Cloneable, Comparable<Entity> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Entity"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java index 8a88f01..9dd62b7 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntitySearchField.java @@ -7,6 +7,10 @@ package org.apache.airavata.sharing.registry.models; +import java.util.Map; +import java.util.HashMap; +import org.apache.thrift.TEnum; + public enum EntitySearchField implements org.apache.thrift.TEnum { NAME(0), DESCRIPTION(1), http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java index 95220e3..535260c 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class EntityType implements org.apache.thrift.TBase<EntityType, EntityType._Fields>, java.io.Serializable, Cloneable, Comparable<EntityType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EntityType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java index 784ae02..032cfe7 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class GroupMembership implements org.apache.thrift.TBase<GroupMembership, GroupMembership._Fields>, java.io.Serializable, Cloneable, Comparable<GroupMembership> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GroupMembership"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java index bb3c945..ddb006c 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class PermissionType implements org.apache.thrift.TBase<PermissionType, PermissionType._Fields>, java.io.Serializable, Cloneable, Comparable<PermissionType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PermissionType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java index 3693a19..4e2e6e3 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class SearchCriteria implements org.apache.thrift.TBase<SearchCriteria, SearchCriteria._Fields>, java.io.Serializable, Cloneable, Comparable<SearchCriteria> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SearchCriteria"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java index ba914cd..b525a99 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class Sharing implements org.apache.thrift.TBase<Sharing, Sharing._Fields>, java.io.Serializable, Cloneable, Comparable<Sharing> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Sharing"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java index 97917d8..9784111 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class SharingRegistryException extends TException implements org.apache.thrift.TBase<SharingRegistryException, SharingRegistryException._Fields>, java.io.Serializable, Cloneable, Comparable<SharingRegistryException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SharingRegistryException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java index 91649ca..f076336 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java @@ -6,43 +6,30 @@ */ package org.apache.airavata.sharing.registry.models; +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.nio.ByteBuffer; +import java.util.*; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User"); 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)1); private static final org.apache.thrift.protocol.TField DOMAIN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("domainId", org.apache.thrift.protocol.TType.STRING, (short)2); 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)3); - private static final org.apache.thrift.protocol.TField CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", org.apache.thrift.protocol.TType.I64, (short)4); - private static final org.apache.thrift.protocol.TField UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", org.apache.thrift.protocol.TType.I64, (short)5); + 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)4); + 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)5); + private static final org.apache.thrift.protocol.TField ICON_FIELD_DESC = new org.apache.thrift.protocol.TField("icon", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", org.apache.thrift.protocol.TType.I64, (short)7); + private static final org.apache.thrift.protocol.TField UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", org.apache.thrift.protocol.TType.I64, (short)8); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -53,6 +40,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i public String userId; // optional public String domainId; // optional public String userName; // optional + public String firstName; // optional + public String lastName; // optional + public ByteBuffer icon; // optional public long createdTime; // optional public long updatedTime; // optional @@ -61,8 +51,11 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i USER_ID((short)1, "userId"), DOMAIN_ID((short)2, "domainId"), USER_NAME((short)3, "userName"), - CREATED_TIME((short)4, "createdTime"), - UPDATED_TIME((short)5, "updatedTime"); + FIRST_NAME((short)4, "firstName"), + LAST_NAME((short)5, "lastName"), + ICON((short)6, "icon"), + CREATED_TIME((short)7, "createdTime"), + UPDATED_TIME((short)8, "updatedTime"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -83,9 +76,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i return DOMAIN_ID; case 3: // USER_NAME return USER_NAME; - case 4: // CREATED_TIME + case 4: // FIRST_NAME + return FIRST_NAME; + case 5: // LAST_NAME + return LAST_NAME; + case 6: // ICON + return ICON; + case 7: // CREATED_TIME return CREATED_TIME; - case 5: // UPDATED_TIME + case 8: // UPDATED_TIME return UPDATED_TIME; default: return null; @@ -130,7 +129,7 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i private static final int __CREATEDTIME_ISSET_ID = 0; private static final int __UPDATEDTIME_ISSET_ID = 1; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.USER_ID,_Fields.DOMAIN_ID,_Fields.USER_NAME,_Fields.CREATED_TIME,_Fields.UPDATED_TIME}; + private static final _Fields optionals[] = {_Fields.USER_ID,_Fields.DOMAIN_ID,_Fields.USER_NAME,_Fields.FIRST_NAME,_Fields.LAST_NAME,_Fields.ICON,_Fields.CREATED_TIME,_Fields.UPDATED_TIME}; 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); @@ -140,6 +139,12 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i 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.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + 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.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.ICON, new org.apache.thrift.meta_data.FieldMetaData("icon", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); tmpMap.put(_Fields.CREATED_TIME, new org.apache.thrift.meta_data.FieldMetaData("createdTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.UPDATED_TIME, new org.apache.thrift.meta_data.FieldMetaData("updatedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -167,6 +172,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i if (other.isSetUserName()) { this.userName = other.userName; } + if (other.isSetFirstName()) { + this.firstName = other.firstName; + } + if (other.isSetLastName()) { + this.lastName = other.lastName; + } + if (other.isSetIcon()) { + this.icon = org.apache.thrift.TBaseHelper.copyBinary(other.icon); + } this.createdTime = other.createdTime; this.updatedTime = other.updatedTime; } @@ -181,6 +195,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i this.domainId = null; this.userName = null; + this.firstName = null; + this.lastName = null; + this.icon = null; setCreatedTimeIsSet(false); this.createdTime = 0; setUpdatedTimeIsSet(false); @@ -259,6 +276,88 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i } } + public String getFirstName() { + return this.firstName; + } + + public User setFirstName(String firstName) { + this.firstName = firstName; + return this; + } + + 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 User setLastName(String lastName) { + this.lastName = lastName; + return this; + } + + 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 byte[] getIcon() { + setIcon(org.apache.thrift.TBaseHelper.rightSize(icon)); + return icon == null ? null : icon.array(); + } + + public ByteBuffer bufferForIcon() { + return org.apache.thrift.TBaseHelper.copyBinary(icon); + } + + public User setIcon(byte[] icon) { + this.icon = icon == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(icon, icon.length)); + return this; + } + + public User setIcon(ByteBuffer icon) { + this.icon = org.apache.thrift.TBaseHelper.copyBinary(icon); + return this; + } + + public void unsetIcon() { + this.icon = null; + } + + /** Returns true if field icon is set (has been assigned a value) and false otherwise */ + public boolean isSetIcon() { + return this.icon != null; + } + + public void setIconIsSet(boolean value) { + if (!value) { + this.icon = null; + } + } + public long getCreatedTime() { return this.createdTime; } @@ -331,6 +430,30 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i } 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 ICON: + if (value == null) { + unsetIcon(); + } else { + setIcon((ByteBuffer)value); + } + break; + case CREATED_TIME: if (value == null) { unsetCreatedTime(); @@ -361,6 +484,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i case USER_NAME: return getUserName(); + case FIRST_NAME: + return getFirstName(); + + case LAST_NAME: + return getLastName(); + + case ICON: + return getIcon(); + case CREATED_TIME: return getCreatedTime(); @@ -384,6 +516,12 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i return isSetDomainId(); case USER_NAME: return isSetUserName(); + case FIRST_NAME: + return isSetFirstName(); + case LAST_NAME: + return isSetLastName(); + case ICON: + return isSetIcon(); case CREATED_TIME: return isSetCreatedTime(); case UPDATED_TIME: @@ -432,6 +570,33 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i 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_icon = true && this.isSetIcon(); + boolean that_present_icon = true && that.isSetIcon(); + if (this_present_icon || that_present_icon) { + if (!(this_present_icon && that_present_icon)) + return false; + if (!this.icon.equals(that.icon)) + return false; + } + boolean this_present_createdTime = true && this.isSetCreatedTime(); boolean that_present_createdTime = true && that.isSetCreatedTime(); if (this_present_createdTime || that_present_createdTime) { @@ -472,6 +637,21 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i if (present_userName) list.add(userName); + 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_icon = true && (isSetIcon()); + list.add(present_icon); + if (present_icon) + list.add(icon); + boolean present_createdTime = true && (isSetCreatedTime()); list.add(present_createdTime); if (present_createdTime) @@ -523,6 +703,36 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i 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(isSetIcon()).compareTo(other.isSetIcon()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIcon()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.icon, other.icon); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetCreatedTime()).compareTo(other.isSetCreatedTime()); if (lastComparison != 0) { return lastComparison; @@ -592,6 +802,36 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i } first = false; } + if (isSetFirstName()) { + if (!first) sb.append(", "); + sb.append("firstName:"); + if (this.firstName == null) { + sb.append("null"); + } else { + sb.append(this.firstName); + } + first = false; + } + if (isSetLastName()) { + if (!first) sb.append(", "); + sb.append("lastName:"); + if (this.lastName == null) { + sb.append("null"); + } else { + sb.append(this.lastName); + } + first = false; + } + if (isSetIcon()) { + if (!first) sb.append(", "); + sb.append("icon:"); + if (this.icon == null) { + sb.append("null"); + } else { + org.apache.thrift.TBaseHelper.toString(this.icon, sb); + } + first = false; + } if (isSetCreatedTime()) { if (!first) sb.append(", "); sb.append("createdTime:"); @@ -673,7 +913,31 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // CREATED_TIME + case 4: // 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 5: // 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 6: // ICON + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.icon = iprot.readBinary(); + struct.setIconIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 7: // CREATED_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.createdTime = iprot.readI64(); struct.setCreatedTimeIsSet(true); @@ -681,7 +945,7 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // UPDATED_TIME + case 8: // UPDATED_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.updatedTime = iprot.readI64(); struct.setUpdatedTimeIsSet(true); @@ -725,6 +989,27 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i oprot.writeFieldEnd(); } } + if (struct.firstName != null) { + if (struct.isSetFirstName()) { + oprot.writeFieldBegin(FIRST_NAME_FIELD_DESC); + oprot.writeString(struct.firstName); + oprot.writeFieldEnd(); + } + } + if (struct.lastName != null) { + if (struct.isSetLastName()) { + oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); + oprot.writeString(struct.lastName); + oprot.writeFieldEnd(); + } + } + if (struct.icon != null) { + if (struct.isSetIcon()) { + oprot.writeFieldBegin(ICON_FIELD_DESC); + oprot.writeBinary(struct.icon); + oprot.writeFieldEnd(); + } + } if (struct.isSetCreatedTime()) { oprot.writeFieldBegin(CREATED_TIME_FIELD_DESC); oprot.writeI64(struct.createdTime); @@ -762,13 +1047,22 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i if (struct.isSetUserName()) { optionals.set(2); } - if (struct.isSetCreatedTime()) { + if (struct.isSetFirstName()) { optionals.set(3); } - if (struct.isSetUpdatedTime()) { + if (struct.isSetLastName()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetIcon()) { + optionals.set(5); + } + if (struct.isSetCreatedTime()) { + optionals.set(6); + } + if (struct.isSetUpdatedTime()) { + optionals.set(7); + } + oprot.writeBitSet(optionals, 8); if (struct.isSetUserId()) { oprot.writeString(struct.userId); } @@ -778,6 +1072,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i if (struct.isSetUserName()) { oprot.writeString(struct.userName); } + if (struct.isSetFirstName()) { + oprot.writeString(struct.firstName); + } + if (struct.isSetLastName()) { + oprot.writeString(struct.lastName); + } + if (struct.isSetIcon()) { + oprot.writeBinary(struct.icon); + } if (struct.isSetCreatedTime()) { oprot.writeI64(struct.createdTime); } @@ -789,7 +1092,7 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i @Override public void read(org.apache.thrift.protocol.TProtocol prot, User struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(8); if (incoming.get(0)) { struct.userId = iprot.readString(); struct.setUserIdIsSet(true); @@ -803,10 +1106,22 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i struct.setUserNameIsSet(true); } if (incoming.get(3)) { + struct.firstName = iprot.readString(); + struct.setFirstNameIsSet(true); + } + if (incoming.get(4)) { + struct.lastName = iprot.readString(); + struct.setLastNameIsSet(true); + } + if (incoming.get(5)) { + struct.icon = iprot.readBinary(); + struct.setIconIsSet(true); + } + if (incoming.get(6)) { struct.createdTime = iprot.readI64(); struct.setCreatedTimeIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(7)) { struct.updatedTime = iprot.readI64(); struct.setUpdatedTimeIsSet(true); } http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java index f121e63..fc77feb 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class UserGroup implements org.apache.thrift.TBase<UserGroup, UserGroup._Fields>, java.io.Serializable, Cloneable, Comparable<UserGroup> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserGroup"); http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java index c355c7e..25c4553 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-12") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") public class GovRegistryService { public interface Iface { http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/thrift_models/sharing_models.thrift ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/thrift_models/sharing_models.thrift b/modules/sharing-registry/thrift_models/sharing_models.thrift index 79bb564..69409fc 100644 --- a/modules/sharing-registry/thrift_models/sharing_models.thrift +++ b/modules/sharing-registry/thrift_models/sharing_models.thrift @@ -34,8 +34,11 @@ struct Domain { 1: optional string userId = DO_NOT_SET_AT_CLIENTS_ID, 2: optional string domainId, 3: optional string userName, - 4: optional i64 createdTime, - 5: optional i64 updatedTime + 4: optional string firstName, + 5: optional string lastName, + 6: optional binary icon, + 7: optional i64 createdTime, + 8: optional i64 updatedTime } enum GroupType {