airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [47/50] [abbrv] airavata git commit: Resolve merge conflicts after merging ajinkya:user-profile with gourav:user-profile
Date Wed, 05 Apr 2017 19:11:11 GMT
Resolve merge conflicts after merging ajinkya:user-profile with gourav:user-profile


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ecdacd4a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ecdacd4a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ecdacd4a

Branch: refs/heads/develop
Commit: ecdacd4a185bc89d2c662afc4745581c5fc13183
Parents: 5946869 5bbecff
Author: Gourav Shenoy <shenoy.200@gmail.com>
Authored: Wed Apr 5 13:32:15 2017 -0400
Committer: Gourav Shenoy <shenoy.200@gmail.com>
Committed: Wed Apr 5 13:32:15 2017 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |   14 +-
 .../application/io/InputDataObjectType.java     |   63 +-
 .../apache/airavata/model/dbevent/CrudType.java |   68 +
 .../airavata/model/dbevent/DBEventMessage.java  |  622 +++
 .../model/dbevent/DBEventMessageContext.java    |  387 ++
 .../model/dbevent/DBEventPublisher.java         |  411 ++
 .../model/dbevent/DBEventPublisherContext.java  |  641 +++
 .../model/dbevent/DBEventSubscriber.java        |  406 ++
 .../airavata/model/dbevent/DBEventType.java     |   62 +
 .../airavata/model/dbevent/EntityType.java      |   80 +
 .../model/error/DuplicateEntryException.java    |  413 ++
 .../model/messaging/event/MessageType.java      |    5 +-
 .../airavata/model/user/NSFDemographics.java    |  149 +-
 .../apache/airavata/model/user/UserProfile.java |  190 +-
 airavata-services/pom.xml                       |   15 +
 airavata-services/profile-service/pom.xml       |   10 +
 .../java-client-samples/pom.xml                 |   37 +
 .../client/samples/TenantProfileSample.java     |   61 +
 .../client/samples/UserProfileSample.java       |  127 +
 .../client/util/ProfileServiceClientUtil.java   |   47 +
 .../resources/profile-client-sample.properties  |   29 +
 .../profile-service-client-sdks/pom.xml         |   34 +
 .../profile-service-commons/pom.xml             |   39 +-
 .../user/entities/NSFDemographicsEntity.java    |   15 +
 .../user/entities/UserProfileEntity.java        |   13 +-
 .../profile/commons/utils/QueryConstants.java   |    2 +-
 .../profile-service-server/pom.xml              |   19 +
 .../handlers/TenantProfileServiceHandler.java   |   61 +-
 .../handlers/UserProfileServiceHandler.java     |   90 +-
 .../profile/utils/ProfileServiceUtils.java      |   70 +
 .../profile-service-stubs/pom.xml               |    9 +
 .../tenant/cpi/TenantProfileService.java        | 2729 ++++++++---
 .../TenantProfileServiceException.java          |    2 +-
 .../profile/user/cpi/UserProfileService.java    | 2876 ++++++++---
 .../exception/UserProfileServiceException.java  |    2 +-
 .../profile-service/profile-tenant-core/pom.xml |    9 +
 .../repositories/UserProfileRepository.java     |    4 +-
 airavata-services/services-security/pom.xml     |   92 +
 .../security/AiravataSecurityManager.java       |   43 +
 .../DefaultAiravataSecurityManager.java         |  273 ++
 .../service/security/IdentityContext.java       |   44 +
 .../apache/airavata/service/security/Main.java  |  179 +
 .../security/SecurityManagerFactory.java        |   60 +
 .../service/security/authzcache/AuthzCache.java |   61 +
 .../security/authzcache/AuthzCacheEntry.java    |   63 +
 .../security/authzcache/AuthzCacheIndex.java    |   90 +
 .../security/authzcache/AuthzCacheManager.java  |   80 +
 .../authzcache/AuthzCacheManagerFactory.java    |   60 +
 .../security/authzcache/AuthzCachedStatus.java  |   34 +
 .../authzcache/DefaultAuthzCacheManager.java    |  106 +
 .../security/interceptor/SecurityCheck.java     |   37 +
 .../interceptor/SecurityInterceptor.java        |   83 +
 .../security/interceptor/SecurityModule.java    |   43 +
 .../security/oauth/DefaultOAuthClient.java      |   91 +
 .../security/xacml/DefaultPAPClient.java        |  125 +
 .../service/security/xacml/DefaultXACMLPEP.java |  133 +
 .../common/utils/DBEventManagerConstants.java   |   99 +
 .../airavata/common/utils/DBEventService.java   |   42 +
 .../main/resources/airavata-server.properties   |    6 +-
 modules/db-event-manager/pom.xml                |   41 +
 .../db/event/manager/DBEventManagerRunner.java  |   78 +
 .../messaging/DBEventManagerException.java      |   42 +
 .../DBEventManagerMessagingFactory.java         |   76 +
 .../messaging/impl/DBEventMessageHandler.java   |  112 +
 .../db/event/manager/utils/Constants.java       |   33 +
 .../manager/utils/DbEventManagerZkUtils.java    |  126 +
 .../db-event-manager/src/test/java/Test.java    |   25 +
 modules/messaging/core/pom.xml                  |    9 +-
 .../messaging/core/MessagingFactory.java        |   30 +-
 .../airavata/messaging/core/Publisher.java      |   10 +-
 .../messaging/core/impl/MessageConsumer.java    |   94 +
 .../messaging/core/impl/RabbitMQPublisher.java  |   37 +
 .../registry-api-service/pom.xml                |    5 +
 .../registry/api/service/RegistryAPIServer.java |   31 +
 .../service/handler/RegistryServerHandler.java  |   35 +-
 .../RegistryServiceDBEventHandler.java          |  159 +
 .../RegistryServiceDBEventMessagingFactory.java |   94 +
 .../registry/api/service/util/Constants.java    |   10 +
 .../api/service/util/DatabaseCreator.java       |   36 +-
 .../airavata/registry/api/RegistryService.java  | 4452 +++++++++++-------
 .../api/exception/RegistryServiceException.java |    2 +-
 .../sharing-registry-server/pom.xml             |    5 +
 .../messaging/SharingServiceDBEventHandler.java |  243 +
 .../SharingServiceDBEventMessagingFactory.java  |  111 +
 .../registry/server/SharingRegistryServer.java  |   20 +
 .../server/SharingRegistryServerHandler.java    |   88 +-
 .../sharing/registry/utils/Constants.java       |   38 +
 .../utils/ThriftDataModelConversion.java        |   28 +
 .../sharing-registry-stubs/pom.xml              |    5 +
 .../service/cpi/SharingRegistryService.java     |  532 ++-
 .../sharing-service-docs/api-docs/index.html    |  119 +
 .../api-docs/sharing_cpi.html                   |    8 +-
 .../thrift_models/sharing_cpi.thrift            |    9 +-
 .../thrift_models/thrift-gen.sh                 |    4 +-
 .../airavata-apis/airavata_errors.thrift        |    9 +
 .../airavata-apis/db_event_model.thrift         |   81 +
 .../airavata-apis/messaging_events.thrift       |    3 +-
 .../component-cpis/generate-cpi-stubs.sh        |    2 +-
 .../component-cpis/registry-api.thrift          |   16 +-
 .../data-models/airavata_data_models.thrift     |    1 +
 .../user-group-models/user_profile_model.thrift |   18 +-
 .../generate-thrift-stubs.sh                    |   10 +-
 .../service-cpis/generate-service-cpi-stubs.sh  |    2 +-
 .../profile-tenant/profile-tenant-cpi.thrift    |   42 +-
 .../profile-user/profile-user-cpi.thrift        |   50 +-
 105 files changed, 15490 insertions(+), 3146 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/ecdacd4a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/ecdacd4a/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --cc modules/configuration/server/src/main/resources/airavata-server.properties
index f860759,78fc87d..2f2d5df
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@@ -356,8 -351,12 +356,12 @@@ user.profile.catalog.validationQuery=SE
  profile.service.server.host=localhost
  profile.service.server.port=8962
  profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
- profile.service.jdbc.url=jdbc:derby:profile-service;create=true;user=airavata;password=airavata
+ # derby properties
 -#profile.service.jdbc.url=jdbc:derby:profile_service;create=true;user=airavata;password=airavata
 -#profile.service.jdbc.driver=org.apache.derby.jdbc.ClientDriver
++profile.service.jdbc.url=jdbc:derby:profile_service;create=true;user=airavata;password=airavata
 +profile.service.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+ # mysql properties
 -profile.service.jdbc.url=jdbc:mysql://localhost:3306/profile_service
 -profile.service.jdbc.driver=com.mysql.jdbc.Driver
++#profile.service.jdbc.url=jdbc:mysql://localhost:3306/profile_service
++#profile.service.jdbc.driver=com.mysql.jdbc.Driver
  profile.service.jdbc.user=airavata
  profile.service.jdbc.password=airavata
  profile.service.validationQuery=SELECT 1

http://git-wip-us.apache.org/repos/asf/airavata/blob/ecdacd4a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/ecdacd4a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
diff --cc modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index c3c7c18,b102d13..7a60a19
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@@ -49,11 -50,11 +50,11 @@@ public class SharingRegistryServerHandl
       * *
       */
      @Override
-     public String createDomain(Domain domain) throws SharingRegistryException, TException {
+     public String createDomain(Domain domain) throws SharingRegistryException, DuplicateEntryException, TException {
          try{
 -            domain.setDomainId(domain.getDomainId());
 -            if((new DomainRepository()).get(domain.getDomainId()) != null)
 -                throw new DuplicateEntryException("There exist domain with given domain id : " + domain.getDomainId());
 +            domain.setDomainId(domain.name);
 +            if((new DomainRepository()).get(domain.domainId) != null)
-                 throw new SharingRegistryException("There exist domain with given domain id");
++                throw new DuplicateEntryException("There exist domain with given domain id");
  
              domain.setCreatedTime(System.currentTimeMillis());
              domain.setUpdatedTime(System.currentTimeMillis());
@@@ -148,7 -134,7 +149,7 @@@
              userPK.setUserId(user.getUserId());
              userPK.setDomainId(user.domainId);
              if((new UserRepository()).get(userPK) != null)
-                 throw new SharingRegistryException("There exist user with given user id");
 -                throw new DuplicateEntryException("There exist user with given user id : " + user.getUserId());
++                throw new DuplicateEntryException("There exist user with given user id");
  
              user.setCreatedTime(System.currentTimeMillis());
              user.setUpdatedTime(System.currentTimeMillis());
@@@ -309,24 -277,6 +310,27 @@@
          }
      }
  
 +    /**
-      * <p>API method to check Group Exists</p>
-      *
-      * @param group
++     * API method to check Group Exists
++     * @param domainId
++     * @param groupId
++     * @return
++     * @throws SharingRegistryException
++     * @throws TException
 +     */
 +    @Override
 +    public boolean isGroupExists(String domainId, String groupId) throws SharingRegistryException, TException {
 +        try{
 +            UserGroupPK userGroupPK = new UserGroupPK();
 +            userGroupPK.setDomainId(domainId);
 +            userGroupPK.setGroupId(groupId);
 +            return (new UserGroupRepository()).isExists(userGroupPK);
 +        }catch (SharingRegistryException ex) {
 +            logger.error(ex.getMessage(), ex);
 +            throw ex;
 +        }
 +    }
 +
      @Override
      public boolean deleteGroup(String domainId, String groupId) throws SharingRegistryException, TException {
          try{
@@@ -474,7 -424,7 +478,7 @@@
              entityTypePK.setDomainId(entityType.domainId);
              entityTypePK.setEntityTypeId(entityType.entityTypeId);
              if((new EntityTypeRepository()).get(entityTypePK) != null)
-                 throw new SharingRegistryException("There exist EntityType with given EntityType id");
 -                throw new DuplicateEntryException("There exist EntityType with given EntityType id : " + entityType.domainId);
++                throw new DuplicateEntryException("There exist EntityType with given EntityType id");
  
              entityType.setCreatedTime(System.currentTimeMillis());
              entityType.setUpdatedTime(System.currentTimeMillis());
@@@ -572,7 -504,7 +576,7 @@@
              permissionTypePK.setDomainId(permissionType.domainId);
              permissionTypePK.setPermissionTypeId(permissionType.permissionTypeId);
              if((new PermissionTypeRepository()).get(permissionTypePK) != null)
-                 throw new SharingRegistryException("There exist PermissionType with given PermissionType id");
 -                throw new DuplicateEntryException("There exist PermissionType with given PermissionType id : " + permissionType.domainId);
++                throw new DuplicateEntryException("There exist PermissionType with given PermissionType id");
              permissionType.setCreatedTime(System.currentTimeMillis());
              permissionType.setUpdatedTime(System.currentTimeMillis());
              (new PermissionTypeRepository()).create(permissionType);
@@@ -662,13 -576,13 +666,13 @@@
       * *
       */
      @Override
--    public String createEntity(Entity entity) throws SharingRegistryException, TException {
++    public String createEntity(Entity entity) throws SharingRegistryException, DuplicateEntryException, TException {
          try{
              EntityPK entityPK = new EntityPK();
              entityPK.setDomainId(entity.domainId);
              entityPK.setEntityId(entity.entityId);
              if((new EntityRepository()).get(entityPK) != null)
--                throw new SharingRegistryException("There exist Entity with given Entity id");
++                throw new DuplicateEntryException("There exist Entity with given Entity id");
  
              UserPK userPK = new UserPK();
              userPK.setDomainId(entity.domainId);
@@@ -731,9 -645,9 +735,7 @@@
      @Override
      public boolean updateEntity(Entity entity) throws SharingRegistryException, TException {
          try{
--            //checks whether the entity is shared with anyone
--            entity.setShared((new UserGroupRepository()).isShared(entity.domainId, entity.entityId));
--
++            //TODO Check for permission changes
              entity.setUpdatedTime(System.currentTimeMillis());
              EntityPK entityPK = new EntityPK();
              entityPK.setDomainId(entity.domainId);
@@@ -831,24 -726,27 +833,20 @@@
      }
  
      /**
-      * * Sharing Entity with Users and Groups
-      * *
--     *
++     * Sharing Entity with Users and Groups
+      * @param domainId
       * @param entityId
       * @param userList
-      * @param permissionType
+      * @param permissionTypeId
+      * @param cascadePermission
+      * @return
+      * @throws SharingRegistryException
+      * @throws TException
       */
      @Override
      public boolean shareEntityWithUsers(String domainId, String entityId, List<String> userList, String permissionTypeId, boolean cascadePermission) throws SharingRegistryException, TException {
          try{
--            boolean result = shareEntity(domainId, entityId, userList, permissionTypeId, cascadePermission);
--            EntityPK entityPK = new EntityPK();
--            entityPK.setEntityId(entityId);
--            entityPK.setDomainId(domainId);
--            Entity entity = (new EntityRepository()).get(entityPK);
--            entity.setShared(true);
--            (new EntityRepository()).update(entity);
--            return result;
++            return shareEntity(domainId, entityId, userList, permissionTypeId, cascadePermission);
          }catch (SharingRegistryException ex) {
              logger.error(ex.getMessage(), ex);
              throw ex;
@@@ -858,16 -756,16 +856,8 @@@
      @Override
      public boolean shareEntityWithGroups(String domainId, String entityId, List<String> groupList, String permissionTypeId, boolean cascadePermission) throws SharingRegistryException, TException {
          try{
--            boolean result = shareEntity(domainId, entityId, groupList, permissionTypeId, cascadePermission);
--            EntityPK entityPK = new EntityPK();
--            entityPK.setEntityId(entityId);
--            entityPK.setDomainId(domainId);
--            Entity entity = (new EntityRepository()).get(entityPK);
--            entity.setShared(true);
--            (new EntityRepository()).update(entity);
--            return result;
++            return shareEntity(domainId, entityId, groupList, permissionTypeId, cascadePermission);
          }catch (SharingRegistryException ex) {
--
              logger.error(ex.getMessage(), ex);
              throw ex;
          }
@@@ -944,14 -835,14 +934,7 @@@
              if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){
                  throw new SharingRegistryException(OWNER_PERMISSION_NAME + " permission cannot be assigned or removed");
              }
--            boolean result = revokeEntitySharing(domainId, entityId, userList, permissionTypeId);
--            EntityPK entityPK = new EntityPK();
--            entityPK.setEntityId(entityId);
--            entityPK.setDomainId(domainId);
--            Entity entity = (new EntityRepository()).get(entityPK);
--            entity.setShared((new UserGroupRepository()).isShared(domainId, entityId));
--            (new EntityRepository()).update(entity);
--            return result;
++            return revokeEntitySharing(domainId, entityId, userList, permissionTypeId);
          }catch (SharingRegistryException ex) {
              logger.error(ex.getMessage(), ex);
              throw ex;
@@@ -965,14 -856,14 +948,7 @@@
              if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){
                  throw new SharingRegistryException(OWNER_PERMISSION_NAME + " permission cannot be assigned or removed");
              }
--            boolean result = revokeEntitySharing(domainId, entityId, groupList, permissionTypeId);
--            EntityPK entityPK = new EntityPK();
--            entityPK.setEntityId(entityId);
--            entityPK.setDomainId(domainId);
--            Entity entity = (new EntityRepository()).get(entityPK);
--            entity.setShared((new UserGroupRepository()).isShared(domainId, entityId));
--            (new EntityRepository()).update(entity);
--            return result;
++            return revokeEntitySharing(domainId, entityId, groupList, permissionTypeId);
          }catch (SharingRegistryException ex) {
              logger.error(ex.getMessage(), ex);
              throw ex;
@@@ -1001,8 -892,8 +977,6 @@@
                  throw new SharingRegistryException(OWNER_PERMISSION_NAME + " permission cannot be removed");
              }
  
--            SharingRepository sharingRepository = new SharingRepository();
--
              //revoking permission for the entity
              for(String groupId : groupOrUserList){
                  SharingPK sharingPK = new SharingPK();
@@@ -1012,7 -903,7 +986,7 @@@
                  sharingPK.setInheritedParentId(entityId);
                  sharingPK.setDomainId(domainId);
  
--                sharingRepository.delete(sharingPK);
++                (new SharingRepository()).delete(sharingPK);
              }
  
              //revoking permission from inheritance
@@@ -1028,16 -919,9 +1002,16 @@@
                      sharingPK.setInheritedParentId(entityId);
                      sharingPK.setDomainId(domainId);
  
--                    sharingRepository.delete(sharingPK);
++                    (new SharingRepository()).delete(sharingPK);
                  }
              }
 +
 +            EntityPK entityPK = new EntityPK();
 +            entityPK.setDomainId(domainId);
 +            entityPK.setEntityId(entityId);
 +            Entity entity = (new EntityRepository()).get(entityPK);
 +            entity.setSharedCount((new SharingRepository()).getSharedCount(domainId, entityId));
 +            (new EntityRepository()).update(entity);
              return true;
          }catch (SharingRegistryException ex) {
              logger.error(ex.getMessage(), ex);

http://git-wip-us.apache.org/repos/asf/airavata/blob/ecdacd4a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
----------------------------------------------------------------------
diff --cc modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
index eb3d3be,0fcbdeb..8080925
--- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
+++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
@@@ -13281,25 -12603,25 +13428,28 @@@ public class SharingRegistryService 
  
    }
  
 -  public static class updatedUser_result implements org.apache.thrift.TBase<updatedUser_result, updatedUser_result._Fields>, java.io.Serializable, Cloneable, Comparable<updatedUser_result>   {
 -    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updatedUser_result");
 +  public static class createUser_result implements org.apache.thrift.TBase<createUser_result, createUser_result._Fields>, java.io.Serializable, Cloneable, Comparable<createUser_result>   {
 +    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createUser_result");
  
 -    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
 +    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
      private static final org.apache.thrift.protocol.TField SRE_FIELD_DESC = new org.apache.thrift.protocol.TField("sre", org.apache.thrift.protocol.TType.STRUCT, (short)1);
++    private static final org.apache.thrift.protocol.TField DEE_FIELD_DESC = new org.apache.thrift.protocol.TField("dee", org.apache.thrift.protocol.TType.STRUCT, (short)2);
  
      private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
      static {
 -      schemes.put(StandardScheme.class, new updatedUser_resultStandardSchemeFactory());
 -      schemes.put(TupleScheme.class, new updatedUser_resultTupleSchemeFactory());
 +      schemes.put(StandardScheme.class, new createUser_resultStandardSchemeFactory());
 +      schemes.put(TupleScheme.class, new createUser_resultTupleSchemeFactory());
      }
  
 -    public boolean success; // required
 +    public String success; // required
      public org.apache.airavata.sharing.registry.models.SharingRegistryException sre; // required
++    public org.apache.airavata.model.error.DuplicateEntryException dee; // required
  
      /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
      public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        SUCCESS((short)0, "success"),
--      SRE((short)1, "sre");
++      SRE((short)1, "sre"),
++      DEE((short)2, "dee");
  
        private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
  
@@@ -13318,6 -12640,6 +13468,8 @@@
              return SUCCESS;
            case 1: // SRE
              return SRE;
++          case 2: // DEE
++            return DEE;
            default:
              return null;
          }
@@@ -13362,23 -12686,24 +13514,27 @@@
      static {
        Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
        tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 -          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
 +          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
        tmpMap.put(_Fields.SRE, new org.apache.thrift.meta_data.FieldMetaData("sre", org.apache.thrift.TFieldRequirementType.DEFAULT, 
            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
++      tmpMap.put(_Fields.DEE, new org.apache.thrift.meta_data.FieldMetaData("dee", org.apache.thrift.TFieldRequirementType.DEFAULT, 
++          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
        metaDataMap = Collections.unmodifiableMap(tmpMap);
 -      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updatedUser_result.class, metaDataMap);
 +      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createUser_result.class, metaDataMap);
      }
  
 -    public updatedUser_result() {
 +    public createUser_result() {
      }
  
 -    public updatedUser_result(
 -      boolean success,
 -      org.apache.airavata.sharing.registry.models.SharingRegistryException sre)
 +    public createUser_result(
 +      String success,
-       org.apache.airavata.sharing.registry.models.SharingRegistryException sre)
++      org.apache.airavata.sharing.registry.models.SharingRegistryException sre,
++      org.apache.airavata.model.error.DuplicateEntryException dee)
      {
        this();
        this.success = success;
 -      setSuccessIsSet(true);
        this.sre = sre;
++      this.dee = dee;
      }
  
      /**
@@@ -13391,19 -12715,20 +13547,23 @@@
        if (other.isSetSre()) {
          this.sre = new org.apache.airavata.sharing.registry.models.SharingRegistryException(other.sre);
        }
++      if (other.isSetDee()) {
++        this.dee = new org.apache.airavata.model.error.DuplicateEntryException(other.dee);
++      }
      }
  
 -    public updatedUser_result deepCopy() {
 -      return new updatedUser_result(this);
 +    public createUser_result deepCopy() {
 +      return new createUser_result(this);
      }
  
      @Override
      public void clear() {
 -      setSuccessIsSet(false);
 -      this.success = false;
 +      this.success = null;
        this.sre = null;
++      this.dee = null;
      }
  
 -    public boolean isSuccess() {
 +    public String getSuccess() {
        return this.success;
      }
  
@@@ -13451,6 -12775,6 +13611,30 @@@
        }
      }
  
++    public org.apache.airavata.model.error.DuplicateEntryException getDee() {
++      return this.dee;
++    }
++
++    public createUser_result setDee(org.apache.airavata.model.error.DuplicateEntryException dee) {
++      this.dee = dee;
++      return this;
++    }
++
++    public void unsetDee() {
++      this.dee = null;
++    }
++
++    /** Returns true if field dee is set (has been assigned a value) and false otherwise */
++    public boolean isSetDee() {
++      return this.dee != null;
++    }
++
++    public void setDeeIsSet(boolean value) {
++      if (!value) {
++        this.dee = null;
++      }
++    }
++
      public void setFieldValue(_Fields field, Object value) {
        switch (field) {
        case SUCCESS:
@@@ -13469,6 -12793,6 +13653,14 @@@
          }
          break;
  
++      case DEE:
++        if (value == null) {
++          unsetDee();
++        } else {
++          setDee((org.apache.airavata.model.error.DuplicateEntryException)value);
++        }
++        break;
++
        }
      }
  
@@@ -13480,6 -12804,6 +13672,9 @@@
        case SRE:
          return getSre();
  
++      case DEE:
++        return getDee();
++
        }
        throw new IllegalStateException();
      }
@@@ -13495,6 -12819,6 +13690,8 @@@
          return isSetSuccess();
        case SRE:
          return isSetSre();
++      case DEE:
++        return isSetDee();
        }
        throw new IllegalStateException();
      }
@@@ -13530,6 -12854,6 +13727,15 @@@
            return false;
        }
  
++      boolean this_present_dee = true && this.isSetDee();
++      boolean that_present_dee = true && that.isSetDee();
++      if (this_present_dee || that_present_dee) {
++        if (!(this_present_dee && that_present_dee))
++          return false;
++        if (!this.dee.equals(that.dee))
++          return false;
++      }
++
        return true;
      }
  
@@@ -13547,6 -12871,6 +13753,11 @@@
        if (present_sre)
          list.add(sre);
  
++      boolean present_dee = true && (isSetDee());
++      list.add(present_dee);
++      if (present_dee)
++        list.add(dee);
++
        return list.hashCode();
      }
  
@@@ -13578,6 -12902,6 +13789,16 @@@
            return lastComparison;
          }
        }
++      lastComparison = Boolean.valueOf(isSetDee()).compareTo(other.isSetDee());
++      if (lastComparison != 0) {
++        return lastComparison;
++      }
++      if (isSetDee()) {
++        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dee, other.dee);
++        if (lastComparison != 0) {
++          return lastComparison;
++        }
++      }
        return 0;
      }
  
@@@ -13613,6 -12933,6 +13834,14 @@@
          sb.append(this.sre);
        }
        first = false;
++      if (!first) sb.append(", ");
++      sb.append("dee:");
++      if (this.dee == null) {
++        sb.append("null");
++      } else {
++        sb.append(this.dee);
++      }
++      first = false;
        sb.append(")");
        return sb.toString();
      }
@@@ -13673,6 -12995,6 +13902,15 @@@
                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                }
                break;
++            case 2: // DEE
++              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
++                struct.dee = new org.apache.airavata.model.error.DuplicateEntryException();
++                struct.dee.read(iprot);
++                struct.setDeeIsSet(true);
++              } else { 
++                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
++              }
++              break;
              default:
                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
            }
@@@ -13698,6 -13020,6 +13936,11 @@@
            struct.sre.write(oprot);
            oprot.writeFieldEnd();
          }
++        if (struct.dee != null) {
++          oprot.writeFieldBegin(DEE_FIELD_DESC);
++          struct.dee.write(oprot);
++          oprot.writeFieldEnd();
++        }
          oprot.writeFieldStop();
          oprot.writeStructEnd();
        }
@@@ -13722,21 -13044,21 +13965,27 @@@
          if (struct.isSetSre()) {
            optionals.set(1);
          }
--        oprot.writeBitSet(optionals, 2);
++        if (struct.isSetDee()) {
++          optionals.set(2);
++        }
++        oprot.writeBitSet(optionals, 3);
          if (struct.isSetSuccess()) {
 -          oprot.writeBool(struct.success);
 +          oprot.writeString(struct.success);
          }
          if (struct.isSetSre()) {
            struct.sre.write(oprot);
          }
++        if (struct.isSetDee()) {
++          struct.dee.write(oprot);
++        }
        }
  
        @Override
 -      public void read(org.apache.thrift.protocol.TProtocol prot, updatedUser_result struct) throws org.apache.thrift.TException {
 +      public void read(org.apache.thrift.protocol.TProtocol prot, createUser_result struct) throws org.apache.thrift.TException {
          TTupleProtocol iprot = (TTupleProtocol) prot;
--        BitSet incoming = iprot.readBitSet(2);
++        BitSet incoming = iprot.readBitSet(3);
          if (incoming.get(0)) {
 -          struct.success = iprot.readBool();
 +          struct.success = iprot.readString();
            struct.setSuccessIsSet(true);
          }
          if (incoming.get(1)) {
@@@ -13744,6 -13066,6 +13993,11 @@@
            struct.sre.read(iprot);
            struct.setSreIsSet(true);
          }
++        if (incoming.get(2)) {
++          struct.dee = new org.apache.airavata.model.error.DuplicateEntryException();
++          struct.dee.read(iprot);
++          struct.setDeeIsSet(true);
++        }
        }
      }
  
@@@ -30770,25 -30199,25 +31024,28 @@@
  
    }
  
 -  public static class getEntityType_result implements org.apache.thrift.TBase<getEntityType_result, getEntityType_result._Fields>, java.io.Serializable, Cloneable, Comparable<getEntityType_result>   {
 -    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getEntityType_result");
 +  public static class createEntityType_result implements org.apache.thrift.TBase<createEntityType_result, createEntityType_result._Fields>, java.io.Serializable, Cloneable, Comparable<createEntityType_result>   {
 +    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createEntityType_result");
  
 -    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
 +    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
      private static final org.apache.thrift.protocol.TField SRE_FIELD_DESC = new org.apache.thrift.protocol.TField("sre", org.apache.thrift.protocol.TType.STRUCT, (short)1);
++    private static final org.apache.thrift.protocol.TField DEE_FIELD_DESC = new org.apache.thrift.protocol.TField("dee", org.apache.thrift.protocol.TType.STRUCT, (short)2);
  
      private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
      static {
 -      schemes.put(StandardScheme.class, new getEntityType_resultStandardSchemeFactory());
 -      schemes.put(TupleScheme.class, new getEntityType_resultTupleSchemeFactory());
 +      schemes.put(StandardScheme.class, new createEntityType_resultStandardSchemeFactory());
 +      schemes.put(TupleScheme.class, new createEntityType_resultTupleSchemeFactory());
      }
  
 -    public org.apache.airavata.sharing.registry.models.EntityType success; // required
 +    public String success; // required
      public org.apache.airavata.sharing.registry.models.SharingRegistryException sre; // required
++    public org.apache.airavata.model.error.DuplicateEntryException dee; // required
  
      /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
      public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        SUCCESS((short)0, "success"),
--      SRE((short)1, "sre");
++      SRE((short)1, "sre"),
++      DEE((short)2, "dee");
  
        private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
  
@@@ -30807,6 -30236,6 +31064,8 @@@
              return SUCCESS;
            case 1: // SRE
              return SRE;
++          case 2: // DEE
++            return DEE;
            default:
              return null;
          }
@@@ -30851,23 -30280,23 +31110,27 @@@
      static {
        Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
        tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 -          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.sharing.registry.models.EntityType.class)));
 +          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
        tmpMap.put(_Fields.SRE, new org.apache.thrift.meta_data.FieldMetaData("sre", org.apache.thrift.TFieldRequirementType.DEFAULT, 
            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
++      tmpMap.put(_Fields.DEE, new org.apache.thrift.meta_data.FieldMetaData("dee", org.apache.thrift.TFieldRequirementType.DEFAULT, 
++          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
        metaDataMap = Collections.unmodifiableMap(tmpMap);
 -      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getEntityType_result.class, metaDataMap);
 +      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createEntityType_result.class, metaDataMap);
      }
  
 -    public getEntityType_result() {
 +    public createEntityType_result() {
      }
  
 -    public getEntityType_result(
 -      org.apache.airavata.sharing.registry.models.EntityType success,
 -      org.apache.airavata.sharing.registry.models.SharingRegistryException sre)
 +    public createEntityType_result(
 +      String success,
-       org.apache.airavata.sharing.registry.models.SharingRegistryException sre)
++      org.apache.airavata.sharing.registry.models.SharingRegistryException sre,
++      org.apache.airavata.model.error.DuplicateEntryException dee)
      {
        this();
        this.success = success;
        this.sre = sre;
++      this.dee = dee;
      }
  
      /**
@@@ -30880,19 -30309,19 +31143,23 @@@
        if (other.isSetSre()) {
          this.sre = new org.apache.airavata.sharing.registry.models.SharingRegistryException(other.sre);
        }
++      if (other.isSetDee()) {
++        this.dee = new org.apache.airavata.model.error.DuplicateEntryException(other.dee);
++      }
      }
  
 -    public getEntityType_result deepCopy() {
 -      return new getEntityType_result(this);
 +    public createEntityType_result deepCopy() {
 +      return new createEntityType_result(this);
      }
  
      @Override
      public void clear() {
        this.success = null;
        this.sre = null;
++      this.dee = null;
      }
  
 -    public org.apache.airavata.sharing.registry.models.EntityType getSuccess() {
 +    public String getSuccess() {
        return this.success;
      }
  
@@@ -30940,6 -30369,6 +31207,30 @@@
        }
      }
  
++    public org.apache.airavata.model.error.DuplicateEntryException getDee() {
++      return this.dee;
++    }
++
++    public createEntityType_result setDee(org.apache.airavata.model.error.DuplicateEntryException dee) {
++      this.dee = dee;
++      return this;
++    }
++
++    public void unsetDee() {
++      this.dee = null;
++    }
++
++    /** Returns true if field dee is set (has been assigned a value) and false otherwise */
++    public boolean isSetDee() {
++      return this.dee != null;
++    }
++
++    public void setDeeIsSet(boolean value) {
++      if (!value) {
++        this.dee = null;
++      }
++    }
++
      public void setFieldValue(_Fields field, Object value) {
        switch (field) {
        case SUCCESS:
@@@ -30958,6 -30387,6 +31249,14 @@@
          }
          break;
  
++      case DEE:
++        if (value == null) {
++          unsetDee();
++        } else {
++          setDee((org.apache.airavata.model.error.DuplicateEntryException)value);
++        }
++        break;
++
        }
      }
  
@@@ -30969,6 -30398,6 +31268,9 @@@
        case SRE:
          return getSre();
  
++      case DEE:
++        return getDee();
++
        }
        throw new IllegalStateException();
      }
@@@ -30984,6 -30413,6 +31286,8 @@@
          return isSetSuccess();
        case SRE:
          return isSetSre();
++      case DEE:
++        return isSetDee();
        }
        throw new IllegalStateException();
      }
@@@ -31019,6 -30448,6 +31323,15 @@@
            return false;
        }
  
++      boolean this_present_dee = true && this.isSetDee();
++      boolean that_present_dee = true && that.isSetDee();
++      if (this_present_dee || that_present_dee) {
++        if (!(this_present_dee && that_present_dee))
++          return false;
++        if (!this.dee.equals(that.dee))
++          return false;
++      }
++
        return true;
      }
  
@@@ -31036,6 -30465,6 +31349,11 @@@
        if (present_sre)
          list.add(sre);
  
++      boolean present_dee = true && (isSetDee());
++      list.add(present_dee);
++      if (present_dee)
++        list.add(dee);
++
        return list.hashCode();
      }
  
@@@ -31067,6 -30496,6 +31385,16 @@@
            return lastComparison;
          }
        }
++      lastComparison = Boolean.valueOf(isSetDee()).compareTo(other.isSetDee());
++      if (lastComparison != 0) {
++        return lastComparison;
++      }
++      if (isSetDee()) {
++        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dee, other.dee);
++        if (lastComparison != 0) {
++          return lastComparison;
++        }
++      }
        return 0;
      }
  
@@@ -31102,6 -30531,6 +31430,14 @@@
          sb.append(this.sre);
        }
        first = false;
++      if (!first) sb.append(", ");
++      sb.append("dee:");
++      if (this.dee == null) {
++        sb.append("null");
++      } else {
++        sb.append(this.dee);
++      }
++      first = false;
        sb.append(")");
        return sb.toString();
      }
@@@ -31162,6 -30595,6 +31498,15 @@@
                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                }
                break;
++            case 2: // DEE
++              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
++                struct.dee = new org.apache.airavata.model.error.DuplicateEntryException();
++                struct.dee.read(iprot);
++                struct.setDeeIsSet(true);
++              } else { 
++                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
++              }
++              break;
              default:
                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
            }
@@@ -31187,6 -30620,6 +31532,11 @@@
            struct.sre.write(oprot);
            oprot.writeFieldEnd();
          }
++        if (struct.dee != null) {
++          oprot.writeFieldBegin(DEE_FIELD_DESC);
++          struct.dee.write(oprot);
++          oprot.writeFieldEnd();
++        }
          oprot.writeFieldStop();
          oprot.writeStructEnd();
        }
@@@ -31211,21 -30644,22 +31561,27 @@@
          if (struct.isSetSre()) {
            optionals.set(1);
          }
--        oprot.writeBitSet(optionals, 2);
++        if (struct.isSetDee()) {
++          optionals.set(2);
++        }
++        oprot.writeBitSet(optionals, 3);
          if (struct.isSetSuccess()) {
 -          struct.success.write(oprot);
 +          oprot.writeString(struct.success);
          }
          if (struct.isSetSre()) {
            struct.sre.write(oprot);
          }
++        if (struct.isSetDee()) {
++          struct.dee.write(oprot);
++        }
        }
  
        @Override
 -      public void read(org.apache.thrift.protocol.TProtocol prot, getEntityType_result struct) throws org.apache.thrift.TException {
 +      public void read(org.apache.thrift.protocol.TProtocol prot, createEntityType_result struct) throws org.apache.thrift.TException {
          TTupleProtocol iprot = (TTupleProtocol) prot;
--        BitSet incoming = iprot.readBitSet(2);
++        BitSet incoming = iprot.readBitSet(3);
          if (incoming.get(0)) {
 -          struct.success = new org.apache.airavata.sharing.registry.models.EntityType();
 -          struct.success.read(iprot);
 +          struct.success = iprot.readString();
            struct.setSuccessIsSet(true);
          }
          if (incoming.get(1)) {
@@@ -31233,6 -30667,6 +31589,11 @@@
            struct.sre.read(iprot);
            struct.setSreIsSet(true);
          }
++        if (incoming.get(2)) {
++          struct.dee = new org.apache.airavata.model.error.DuplicateEntryException();
++          struct.dee.read(iprot);
++          struct.setDeeIsSet(true);
++        }
        }
      }
  
@@@ -44182,25 -38211,25 +44543,28 @@@
  
    }
  
 -  public static class getListOfSharedGroups_result implements org.apache.thrift.TBase<getListOfSharedGroups_result, getListOfSharedGroups_result._Fields>, java.io.Serializable, Cloneable, Comparable<getListOfSharedGroups_result>   {
 -    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getListOfSharedGroups_result");
 +  public static class createPermissionType_result implements org.apache.thrift.TBase<createPermissionType_result, createPermissionType_result._Fields>, java.io.Serializable, Cloneable, Comparable<createPermissionType_result>   {
 +    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createPermissionType_result");
  
 -    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
 +    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
      private static final org.apache.thrift.protocol.TField SRE_FIELD_DESC = new org.apache.thrift.protocol.TField("sre", org.apache.thrift.protocol.TType.STRUCT, (short)1);
++    private static final org.apache.thrift.protocol.TField DEE_FIELD_DESC = new org.apache.thrift.protocol.TField("dee", org.apache.thrift.protocol.TType.STRUCT, (short)2);
  
      private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
      static {
 -      schemes.put(StandardScheme.class, new getListOfSharedGroups_resultStandardSchemeFactory());
 -      schemes.put(TupleScheme.class, new getListOfSharedGroups_resultTupleSchemeFactory());
 +      schemes.put(StandardScheme.class, new createPermissionType_resultStandardSchemeFactory());
 +      schemes.put(TupleScheme.class, new createPermissionType_resultTupleSchemeFactory());
      }
  
 -    public List<org.apache.airavata.sharing.registry.models.UserGroup> success; // required
 +    public String success; // required
      public org.apache.airavata.sharing.registry.models.SharingRegistryException sre; // required
++    public org.apache.airavata.model.error.DuplicateEntryException dee; // required
  
      /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
      public enum _Fields implements org.apache.thrift.TFieldIdEnum {
        SUCCESS((short)0, "success"),
--      SRE((short)1, "sre");
++      SRE((short)1, "sre"),
++      DEE((short)2, "dee");
  
        private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
  
@@@ -44219,6 -38248,6 +44583,8 @@@
              return SUCCESS;
            case 1: // SRE
              return SRE;
++          case 2: // DEE
++            return DEE;
            default:
              return null;
          }
@@@ -44263,23 -38292,24 +44629,27 @@@
      static {
        Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
        tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 -          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
 -              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.sharing.registry.models.UserGroup.class))));
 +          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
        tmpMap.put(_Fields.SRE, new org.apache.thrift.meta_data.FieldMetaData("sre", org.apache.thrift.TFieldRequirementType.DEFAULT, 
            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
++      tmpMap.put(_Fields.DEE, new org.apache.thrift.meta_data.FieldMetaData("dee", org.apache.thrift.TFieldRequirementType.DEFAULT, 
++          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
        metaDataMap = Collections.unmodifiableMap(tmpMap);
 -      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getListOfSharedGroups_result.class, metaDataMap);
 +      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createPermissionType_result.class, metaDataMap);
      }
  
 -    public getListOfSharedGroups_result() {
 +    public createPermissionType_result() {
      }
  
 -    public getListOfSharedGroups_result(
 -      List<org.apache.airavata.sharing.registry.models.UserGroup> success,
 -      org.apache.airavata.sharing.registry.models.SharingRegistryException sre)
 +    public createPermissionType_result(
 +      String success,
-       org.apache.airavata.sharing.registry.models.SharingRegistryException sre)
++      org.apache.airavata.sharing.registry.models.SharingRegistryException sre,
++      org.apache.airavata.model.error.DuplicateEntryException dee)
      {
        this();
        this.success = success;
        this.sre = sre;
++      this.dee = dee;
      }
  
      /**
@@@ -44292,19 -38326,34 +44662,23 @@@
        if (other.isSetSre()) {
          this.sre = new org.apache.airavata.sharing.registry.models.SharingRegistryException(other.sre);
        }
++      if (other.isSetDee()) {
++        this.dee = new org.apache.airavata.model.error.DuplicateEntryException(other.dee);
++      }
      }
  
 -    public getListOfSharedGroups_result deepCopy() {
 -      return new getListOfSharedGroups_result(this);
 +    public createPermissionType_result deepCopy() {
 +      return new createPermissionType_result(this);
      }
  
      @Override
      public void clear() {
        this.success = null;
        this.sre = null;
++      this.dee = null;
      }
  
 -    public int getSuccessSize() {
 -      return (this.success == null) ? 0 : this.success.size();
 -    }
 -
 -    public java.util.Iterator<org.apache.airavata.sharing.registry.models.UserGroup> getSuccessIterator() {
 -      return (this.success == null) ? null : this.success.iterator();
 -    }
 -
 -    public void addToSuccess(org.apache.airavata.sharing.registry.models.UserGroup elem) {
 -      if (this.success == null) {
 -        this.success = new ArrayList<org.apache.airavata.sharing.registry.models.UserGroup>();
 -      }
 -      this.success.add(elem);
 -    }
 -
 -    public List<org.apache.airavata.sharing.registry.models.UserGroup> getSuccess() {
 +    public String getSuccess() {
        return this.success;
      }
  
@@@ -44352,6 -38401,6 +44726,30 @@@
        }
      }
  
++    public org.apache.airavata.model.error.DuplicateEntryException getDee() {
++      return this.dee;
++    }
++
++    public createPermissionType_result setDee(org.apache.airavata.model.error.DuplicateEntryException dee) {
++      this.dee = dee;
++      return this;
++    }
++
++    public void unsetDee() {
++      this.dee = null;
++    }
++
++    /** Returns true if field dee is set (has been assigned a value) and false otherwise */
++    public boolean isSetDee() {
++      return this.dee != null;
++    }
++
++    public void setDeeIsSet(boolean value) {
++      if (!value) {
++        this.dee = null;
++      }
++    }
++
      public void setFieldValue(_Fields field, Object value) {
        switch (field) {
        case SUCCESS:
@@@ -44370,6 -38419,6 +44768,14 @@@
          }
          break;
  
++      case DEE:
++        if (value == null) {
++          unsetDee();
++        } else {
++          setDee((org.apache.airavata.model.error.DuplicateEntryException)value);
++        }
++        break;
++
        }
      }
  
@@@ -44381,6 -38430,6 +44787,9 @@@
        case SRE:
          return getSre();
  
++      case DEE:
++        return getDee();
++
        }
        throw new IllegalStateException();
      }
@@@ -44396,6 -38445,6 +44805,8 @@@
          return isSetSuccess();
        case SRE:
          return isSetSre();
++      case DEE:
++        return isSetDee();
        }
        throw new IllegalStateException();
      }
@@@ -44431,6 -38480,6 +44842,15 @@@
            return false;
        }
  
++      boolean this_present_dee = true && this.isSetDee();
++      boolean that_present_dee = true && that.isSetDee();
++      if (this_present_dee || that_present_dee) {
++        if (!(this_present_dee && that_present_dee))
++          return false;
++        if (!this.dee.equals(that.dee))
++          return false;
++      }
++
        return true;
      }
  
@@@ -44448,6 -38497,6 +44868,11 @@@
        if (present_sre)
          list.add(sre);
  
++      boolean present_dee = true && (isSetDee());
++      list.add(present_dee);
++      if (present_dee)
++        list.add(dee);
++
        return list.hashCode();
      }
  
@@@ -44479,6 -38528,6 +44904,16 @@@
            return lastComparison;
          }
        }
++      lastComparison = Boolean.valueOf(isSetDee()).compareTo(other.isSetDee());
++      if (lastComparison != 0) {
++        return lastComparison;
++      }
++      if (isSetDee()) {
++        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dee, other.dee);
++        if (lastComparison != 0) {
++          return lastComparison;
++        }
++      }
        return 0;
      }
  
@@@ -44514,6 -38563,6 +44949,14 @@@
          sb.append(this.sre);
        }
        first = false;
++      if (!first) sb.append(", ");
++      sb.append("dee:");
++      if (this.dee == null) {
++        sb.append("null");
++      } else {
++        sb.append(this.dee);
++      }
++      first = false;
        sb.append(")");
        return sb.toString();
      }
@@@ -44574,6 -38634,6 +45017,15 @@@
                  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
                }
                break;
++            case 2: // DEE
++              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
++                struct.dee = new org.apache.airavata.model.error.DuplicateEntryException();
++                struct.dee.read(iprot);
++                struct.setDeeIsSet(true);
++              } else { 
++                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
++              }
++              break;
              default:
                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
            }
@@@ -44599,6 -38666,6 +45051,11 @@@
            struct.sre.write(oprot);
            oprot.writeFieldEnd();
          }
++        if (struct.dee != null) {
++          oprot.writeFieldBegin(DEE_FIELD_DESC);
++          struct.dee.write(oprot);
++          oprot.writeFieldEnd();
++        }
          oprot.writeFieldStop();
          oprot.writeStructEnd();
        }
@@@ -44623,21 -38690,37 +45080,27 @@@
          if (struct.isSetSre()) {
            optionals.set(1);
          }
--        oprot.writeBitSet(optionals, 2);
++        if (struct.isSetDee()) {
++          optionals.set(2);
++        }
++        oprot.writeBitSet(optionals, 3);
          if (struct.isSetSuccess()) {
 -          {
 -            oprot.writeI32(struct.success.size());
 -            for (org.apache.airavata.sharing.registry.models.UserGroup _iter100 : struct.success)
 -            {
 -              _iter100.write(oprot);
 -            }
 -          }
 +          oprot.writeString(struct.success);
          }
          if (struct.isSetSre()) {
            struct.sre.write(oprot);
          }
++        if (struct.isSetDee()) {
++          struct.dee.write(oprot);
++        }
        }
  
        @Override
 -      public void read(org.apache.thrift.protocol.TProtocol prot, getListOfSharedGroups_result struct) throws org.apache.thrift.TException {
 +      public void read(org.apache.thrift.protocol.TProtocol prot, createPermissionType_result struct) throws org.apache.thrift.TException {
          TTupleProtocol iprot = (TTupleProtocol) prot;
--        BitSet incoming = iprot.readBitSet(2);
++        BitSet incoming = iprot.readBitSet(3);
          if (incoming.get(0)) {
 -          {
 -            org.apache.thrift.protocol.TList _list101 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 -            struct.success = new ArrayList<org.apache.airavata.sharing.registry.models.UserGroup>(_list101.size);
 -            org.apache.airavata.sharing.registry.models.UserGroup _elem102;
 -            for (int _i103 = 0; _i103 < _list101.size; ++_i103)
 -            {
 -              _elem102 = new org.apache.airavata.sharing.registry.models.UserGroup();
 -              _elem102.read(iprot);
 -              struct.success.add(_elem102);
 -            }
 -          }
 +          struct.success = iprot.readString();
            struct.setSuccessIsSet(true);
          }
          if (incoming.get(1)) {
@@@ -44645,6 -38728,6 +45108,11 @@@
            struct.sre.read(iprot);
            struct.setSreIsSet(true);
          }
++        if (incoming.get(2)) {
++          struct.dee = new org.apache.airavata.model.error.DuplicateEntryException();
++          struct.dee.read(iprot);
++          struct.setDeeIsSet(true);
++        }
        }
      }
  

http://git-wip-us.apache.org/repos/asf/airavata/blob/ecdacd4a/modules/sharing-registry/sharing-service-docs/api-docs/index.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/ecdacd4a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_cpi.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/ecdacd4a/modules/sharing-registry/thrift_models/sharing_cpi.thrift
----------------------------------------------------------------------


Mime
View raw message