http://git-wip-us.apache.org/repos/asf/airavata/blob/e43905cb/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/crude/cpi/UserProfileCrudeService.java
----------------------------------------------------------------------
diff --git 
a/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/crude/cpi/UserProfileCrudeService.java
 
b/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/crude/cpi/UserProfileCrudeService.java
index 60d084b..7692d99 100644
--- 
a/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/crude/cpi/UserProfileCrudeService.java
+++ 
b/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/crude/cpi/UserProfileCrudeService.java
@@ -1,19 +1,3 @@
-    /*
-     * Licensed to the Apache Software Foundation (ASF) under one or more
-     * contributor license agreements.  See the NOTICE file distributed with
-     * this work for additional information regarding copyright ownership.
-     * The ASF licenses this file to You under the Apache License, Version 2.0
-     * (the "License"); you may not use this file except in compliance with
-     * the License.  You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     */
 /**
  * Autogenerated by Thrift Compiler (0.9.3)
  *
@@ -50,42 +34,42 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-11-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-11-29")
 public class UserProfileCrudeService {
 
   public interface Iface {
 
-    public String addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException;
+    public String addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException;
 
-    public boolean 
updateUserProfile(org.apache.airavata.model.user.UserProfile userProfile) 
throws org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException;
+    public boolean 
updateUserProfile(org.apache.airavata.model.user.UserProfile userProfile) 
throws org.apache.airavata.registry.api.exception.RegistryServiceException, 
TException;
 
-    public org.apache.airavata.model.user.UserProfile 
getUserProfileById(String userId, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException;
+    public org.apache.airavata.model.user.UserProfile 
getUserProfileById(String userId, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException;
 
-    public boolean deleteUserProfile(String userId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException;
+    public boolean deleteUserProfile(String userId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException;
 
-    public List<org.apache.airavata.model.user.UserProfile> 
getAllUserProfilesInGateway(String gatewayId, int offset, int limit) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.model.user.UserProfile> 
getAllUserProfilesInGateway(String gatewayId, int offset, int limit) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException;
 
-    public org.apache.airavata.model.user.UserProfile 
getUserProfileByName(String userName, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException;
+    public org.apache.airavata.model.user.UserProfile 
getUserProfileByName(String userName, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException;
 
-    public boolean doesUserExist(String userName, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException;
+    public boolean doesUserExist(String userName, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException;
 
   }
 
   public interface AsyncIface {
 
-    public void addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile, AsyncMethodCallback resultHandler) throws TException;
 
-    public void updateUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void updateUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile, AsyncMethodCallback resultHandler) throws TException;
 
-    public void getUserProfileById(String userId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getUserProfileById(String userId, String gatewayId, 
AsyncMethodCallback resultHandler) throws TException;
 
-    public void deleteUserProfile(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void deleteUserProfile(String userId, AsyncMethodCallback 
resultHandler) throws TException;
 
-    public void getAllUserProfilesInGateway(String gatewayId, int offset, int 
limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getAllUserProfilesInGateway(String gatewayId, int offset, int 
limit, AsyncMethodCallback resultHandler) throws TException;
 
-    public void getUserProfileByName(String userName, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getUserProfileByName(String userName, String gatewayId, 
AsyncMethodCallback resultHandler) throws TException;
 
-    public void doesUserExist(String userName, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void doesUserExist(String userName, String gatewayId, 
AsyncMethodCallback resultHandler) throws TException;
 
   }
 
@@ -109,20 +93,20 @@ public class UserProfileCrudeService {
       super(iprot, oprot);
     }
 
-    public String addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public String addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       send_addUserProfile(userProfile);
       return recv_addUserProfile();
     }
 
-    public void send_addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile) throws org.apache.thrift.TException
+    public void send_addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile) throws TException
     {
       addUserProfile_args args = new addUserProfile_args();
       args.setUserProfile(userProfile);
       sendBase("addUserProfile", args);
     }
 
-    public String recv_addUserProfile() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public String recv_addUserProfile() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       addUserProfile_result result = new addUserProfile_result();
       receiveBase(result, "addUserProfile");
@@ -135,20 +119,20 @@ public class UserProfileCrudeService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addUserProfile failed: unknown result");
     }
 
-    public boolean 
updateUserProfile(org.apache.airavata.model.user.UserProfile userProfile) 
throws org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public boolean 
updateUserProfile(org.apache.airavata.model.user.UserProfile userProfile) 
throws org.apache.airavata.registry.api.exception.RegistryServiceException, 
TException
     {
       send_updateUserProfile(userProfile);
       return recv_updateUserProfile();
     }
 
-    public void 
send_updateUserProfile(org.apache.airavata.model.user.UserProfile userProfile) 
throws org.apache.thrift.TException
+    public void 
send_updateUserProfile(org.apache.airavata.model.user.UserProfile userProfile) 
throws TException
     {
       updateUserProfile_args args = new updateUserProfile_args();
       args.setUserProfile(userProfile);
       sendBase("updateUserProfile", args);
     }
 
-    public boolean recv_updateUserProfile() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public boolean recv_updateUserProfile() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       updateUserProfile_result result = new updateUserProfile_result();
       receiveBase(result, "updateUserProfile");
@@ -161,13 +145,13 @@ public class UserProfileCrudeService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateUserProfile failed: unknown result");
     }
 
-    public org.apache.airavata.model.user.UserProfile 
getUserProfileById(String userId, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.user.UserProfile 
getUserProfileById(String userId, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       send_getUserProfileById(userId, gatewayId);
       return recv_getUserProfileById();
     }
 
-    public void send_getUserProfileById(String userId, String gatewayId) 
throws org.apache.thrift.TException
+    public void send_getUserProfileById(String userId, String gatewayId) 
throws TException
     {
       getUserProfileById_args args = new getUserProfileById_args();
       args.setUserId(userId);
@@ -175,7 +159,7 @@ public class UserProfileCrudeService {
       sendBase("getUserProfileById", args);
     }
 
-    public org.apache.airavata.model.user.UserProfile 
recv_getUserProfileById() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.user.UserProfile 
recv_getUserProfileById() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       getUserProfileById_result result = new getUserProfileById_result();
       receiveBase(result, "getUserProfileById");
@@ -188,20 +172,20 @@ public class UserProfileCrudeService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getUserProfileById failed: unknown result");
     }
 
-    public boolean deleteUserProfile(String userId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public boolean deleteUserProfile(String userId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       send_deleteUserProfile(userId);
       return recv_deleteUserProfile();
     }
 
-    public void send_deleteUserProfile(String userId) throws 
org.apache.thrift.TException
+    public void send_deleteUserProfile(String userId) throws TException
     {
       deleteUserProfile_args args = new deleteUserProfile_args();
       args.setUserId(userId);
       sendBase("deleteUserProfile", args);
     }
 
-    public boolean recv_deleteUserProfile() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public boolean recv_deleteUserProfile() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       deleteUserProfile_result result = new deleteUserProfile_result();
       receiveBase(result, "deleteUserProfile");
@@ -214,13 +198,13 @@ public class UserProfileCrudeService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteUserProfile failed: unknown result");
     }
 
-    public List<org.apache.airavata.model.user.UserProfile> 
getAllUserProfilesInGateway(String gatewayId, int offset, int limit) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.user.UserProfile> 
getAllUserProfilesInGateway(String gatewayId, int offset, int limit) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       send_getAllUserProfilesInGateway(gatewayId, offset, limit);
       return recv_getAllUserProfilesInGateway();
     }
 
-    public void send_getAllUserProfilesInGateway(String gatewayId, int offset, 
int limit) throws org.apache.thrift.TException
+    public void send_getAllUserProfilesInGateway(String gatewayId, int offset, 
int limit) throws TException
     {
       getAllUserProfilesInGateway_args args = new 
getAllUserProfilesInGateway_args();
       args.setGatewayId(gatewayId);
@@ -229,7 +213,7 @@ public class UserProfileCrudeService {
       sendBase("getAllUserProfilesInGateway", args);
     }
 
-    public List<org.apache.airavata.model.user.UserProfile> 
recv_getAllUserProfilesInGateway() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.user.UserProfile> 
recv_getAllUserProfilesInGateway() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       getAllUserProfilesInGateway_result result = new 
getAllUserProfilesInGateway_result();
       receiveBase(result, "getAllUserProfilesInGateway");
@@ -242,13 +226,13 @@ public class UserProfileCrudeService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllUserProfilesInGateway failed: unknown result");
     }
 
-    public org.apache.airavata.model.user.UserProfile 
getUserProfileByName(String userName, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.user.UserProfile 
getUserProfileByName(String userName, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       send_getUserProfileByName(userName, gatewayId);
       return recv_getUserProfileByName();
     }
 
-    public void send_getUserProfileByName(String userName, String gatewayId) 
throws org.apache.thrift.TException
+    public void send_getUserProfileByName(String userName, String gatewayId) 
throws TException
     {
       getUserProfileByName_args args = new getUserProfileByName_args();
       args.setUserName(userName);
@@ -256,7 +240,7 @@ public class UserProfileCrudeService {
       sendBase("getUserProfileByName", args);
     }
 
-    public org.apache.airavata.model.user.UserProfile 
recv_getUserProfileByName() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.user.UserProfile 
recv_getUserProfileByName() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       getUserProfileByName_result result = new getUserProfileByName_result();
       receiveBase(result, "getUserProfileByName");
@@ -269,13 +253,13 @@ public class UserProfileCrudeService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getUserProfileByName failed: unknown result");
     }
 
-    public boolean doesUserExist(String userName, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public boolean doesUserExist(String userName, String gatewayId) throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       send_doesUserExist(userName, gatewayId);
       return recv_doesUserExist();
     }
 
-    public void send_doesUserExist(String userName, String gatewayId) throws 
org.apache.thrift.TException
+    public void send_doesUserExist(String userName, String gatewayId) throws 
TException
     {
       doesUserExist_args args = new doesUserExist_args();
       args.setUserName(userName);
@@ -283,7 +267,7 @@ public class UserProfileCrudeService {
       sendBase("doesUserExist", args);
     }
 
-    public boolean recv_doesUserExist() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException
+    public boolean recv_doesUserExist() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException
     {
       doesUserExist_result result = new doesUserExist_result();
       receiveBase(result, "doesUserExist");
@@ -314,7 +298,7 @@ public class UserProfileCrudeService {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void addUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile, AsyncMethodCallback resultHandler) throws TException {
       checkReady();
       addUserProfile_call method_call = new addUserProfile_call(userProfile, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -323,12 +307,12 @@ public class UserProfileCrudeService {
 
     public static class addUserProfile_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.user.UserProfile userProfile;
-      public addUserProfile_call(org.apache.airavata.model.user.UserProfile 
userProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public addUserProfile_call(org.apache.airavata.model.user.UserProfile 
userProfile, AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userProfile = userProfile;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("addUserProfile", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         addUserProfile_args args = new addUserProfile_args();
         args.setUserProfile(userProfile);
@@ -336,8 +320,8 @@ public class UserProfileCrudeService {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException {
-        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public String getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException 
{
+        if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
@@ -346,7 +330,7 @@ public class UserProfileCrudeService {
       }
     }
 
-    public void updateUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void updateUserProfile(org.apache.airavata.model.user.UserProfile 
userProfile, AsyncMethodCallback resultHandler) throws TException {
       checkReady();
       updateUserProfile_call method_call = new 
updateUserProfile_call(userProfile, resultHandler, this, ___protocolFactory, 
___transport);
       this.___currentMethod = method_call;
@@ -355,12 +339,12 @@ public class UserProfileCrudeService {
 
     public static class updateUserProfile_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.user.UserProfile userProfile;
-      public updateUserProfile_call(org.apache.airavata.model.user.UserProfile 
userProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public updateUserProfile_call(org.apache.airavata.model.user.UserProfile 
userProfile, AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userProfile = userProfile;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("updateUserProfile", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         updateUserProfile_args args = new updateUserProfile_args();
         args.setUserProfile(userProfile);
@@ -368,8 +352,8 @@ public class UserProfileCrudeService {
         prot.writeMessageEnd();
       }
 
-      public boolean getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException {
-        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public boolean getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException 
{
+        if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
@@ -378,7 +362,7 @@ public class UserProfileCrudeService {
       }
     }
 
-    public void getUserProfileById(String userId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getUserProfileById(String userId, String gatewayId, 
AsyncMethodCallback resultHandler) throws TException {
       checkReady();
       getUserProfileById_call method_call = new 
getUserProfileById_call(userId, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -388,13 +372,13 @@ public class UserProfileCrudeService {
     public static class getUserProfileById_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private String userId;
       private String gatewayId;
-      public getUserProfileById_call(String userId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getUserProfileById_call(String userId, String gatewayId, 
AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userId = userId;
         this.gatewayId = gatewayId;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getUserProfileById", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getUserProfileById_args args = new getUserProfileById_args();
         args.setUserId(userId);
@@ -403,8 +387,8 @@ public class UserProfileCrudeService {
         prot.writeMessageEnd();
       }
 
-      public org.apache.airavata.model.user.UserProfile getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException {
-        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public org.apache.airavata.model.user.UserProfile getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException 
{
+        if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
@@ -413,7 +397,7 @@ public class UserProfileCrudeService {
       }
     }
 
-    public void deleteUserProfile(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void deleteUserProfile(String userId, AsyncMethodCallback 
resultHandler) throws TException {
       checkReady();
       deleteUserProfile_call method_call = new deleteUserProfile_call(userId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -422,12 +406,12 @@ public class UserProfileCrudeService {
 
     public static class deleteUserProfile_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private String userId;
-      public deleteUserProfile_call(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public deleteUserProfile_call(String userId, AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userId = userId;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("deleteUserProfile", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         deleteUserProfile_args args = new deleteUserProfile_args();
         args.setUserId(userId);
@@ -435,8 +419,8 @@ public class UserProfileCrudeService {
         prot.writeMessageEnd();
       }
 
-      public boolean getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException {
-        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public boolean getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException 
{
+        if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
@@ -445,7 +429,7 @@ public class UserProfileCrudeService {
       }
     }
 
-    public void getAllUserProfilesInGateway(String gatewayId, int offset, int 
limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getAllUserProfilesInGateway(String gatewayId, int offset, int 
limit, AsyncMethodCallback resultHandler) throws TException {
       checkReady();
       getAllUserProfilesInGateway_call method_call = new 
getAllUserProfilesInGateway_call(gatewayId, offset, limit, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -456,14 +440,14 @@ public class UserProfileCrudeService {
       private String gatewayId;
       private int offset;
       private int limit;
-      public getAllUserProfilesInGateway_call(String gatewayId, int offset, 
int limit, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getAllUserProfilesInGateway_call(String gatewayId, int offset, 
int limit, AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.gatewayId = gatewayId;
         this.offset = offset;
         this.limit = limit;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getAllUserProfilesInGateway", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getAllUserProfilesInGateway_args args = new 
getAllUserProfilesInGateway_args();
         args.setGatewayId(gatewayId);
@@ -473,8 +457,8 @@ public class UserProfileCrudeService {
         prot.writeMessageEnd();
       }
 
-      public List<org.apache.airavata.model.user.UserProfile> getResult() 
throws org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException {
-        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public List<org.apache.airavata.model.user.UserProfile> getResult() 
throws org.apache.airavata.registry.api.exception.RegistryServiceException, 
TException {
+        if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
@@ -483,7 +467,7 @@ public class UserProfileCrudeService {
       }
     }
 
-    public void getUserProfileByName(String userName, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getUserProfileByName(String userName, String gatewayId, 
AsyncMethodCallback resultHandler) throws TException {
       checkReady();
       getUserProfileByName_call method_call = new 
getUserProfileByName_call(userName, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -493,13 +477,13 @@ public class UserProfileCrudeService {
     public static class getUserProfileByName_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private String userName;
       private String gatewayId;
-      public getUserProfileByName_call(String userName, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getUserProfileByName_call(String userName, String gatewayId, 
AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userName = userName;
         this.gatewayId = gatewayId;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getUserProfileByName", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getUserProfileByName_args args = new getUserProfileByName_args();
         args.setUserName(userName);
@@ -508,8 +492,8 @@ public class UserProfileCrudeService {
         prot.writeMessageEnd();
       }
 
-      public org.apache.airavata.model.user.UserProfile getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException {
-        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public org.apache.airavata.model.user.UserProfile getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException 
{
+        if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
@@ -518,7 +502,7 @@ public class UserProfileCrudeService {
       }
     }
 
-    public void doesUserExist(String userName, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void doesUserExist(String userName, String gatewayId, 
AsyncMethodCallback resultHandler) throws TException {
       checkReady();
       doesUserExist_call method_call = new doesUserExist_call(userName, 
gatewayId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -528,13 +512,13 @@ public class UserProfileCrudeService {
     public static class doesUserExist_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private String userName;
       private String gatewayId;
-      public doesUserExist_call(String userName, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public doesUserExist_call(String userName, String gatewayId, 
AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userName = userName;
         this.gatewayId = gatewayId;
       }
 
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("doesUserExist", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         doesUserExist_args args = new doesUserExist_args();
         args.setUserName(userName);
@@ -543,8 +527,8 @@ public class UserProfileCrudeService {
         prot.writeMessageEnd();
       }
 
-      public boolean getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, 
org.apache.thrift.TException {
-        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+      public boolean getResult() throws 
org.apache.airavata.registry.api.exception.RegistryServiceException, TException 
{
+        if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
@@ -589,7 +573,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public addUserProfile_result getResult(I iface, addUserProfile_args 
args) throws org.apache.thrift.TException {
+      public addUserProfile_result getResult(I iface, addUserProfile_args 
args) throws TException {
         addUserProfile_result result = new addUserProfile_result();
         try {
           result.success = iface.addUserProfile(args.userProfile);
@@ -613,7 +597,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public updateUserProfile_result getResult(I iface, 
updateUserProfile_args args) throws org.apache.thrift.TException {
+      public updateUserProfile_result getResult(I iface, 
updateUserProfile_args args) throws TException {
         updateUserProfile_result result = new updateUserProfile_result();
         try {
           result.success = iface.updateUserProfile(args.userProfile);
@@ -638,7 +622,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public getUserProfileById_result getResult(I iface, 
getUserProfileById_args args) throws org.apache.thrift.TException {
+      public getUserProfileById_result getResult(I iface, 
getUserProfileById_args args) throws TException {
         getUserProfileById_result result = new getUserProfileById_result();
         try {
           result.success = iface.getUserProfileById(args.userId, 
args.gatewayId);
@@ -662,7 +646,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public deleteUserProfile_result getResult(I iface, 
deleteUserProfile_args args) throws org.apache.thrift.TException {
+      public deleteUserProfile_result getResult(I iface, 
deleteUserProfile_args args) throws TException {
         deleteUserProfile_result result = new deleteUserProfile_result();
         try {
           result.success = iface.deleteUserProfile(args.userId);
@@ -687,7 +671,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public getAllUserProfilesInGateway_result getResult(I iface, 
getAllUserProfilesInGateway_args args) throws org.apache.thrift.TException {
+      public getAllUserProfilesInGateway_result getResult(I iface, 
getAllUserProfilesInGateway_args args) throws TException {
         getAllUserProfilesInGateway_result result = new 
getAllUserProfilesInGateway_result();
         try {
           result.success = iface.getAllUserProfilesInGateway(args.gatewayId, 
args.offset, args.limit);
@@ -711,7 +695,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public getUserProfileByName_result getResult(I iface, 
getUserProfileByName_args args) throws org.apache.thrift.TException {
+      public getUserProfileByName_result getResult(I iface, 
getUserProfileByName_args args) throws TException {
         getUserProfileByName_result result = new getUserProfileByName_result();
         try {
           result.success = iface.getUserProfileByName(args.userName, 
args.gatewayId);
@@ -735,7 +719,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public doesUserExist_result getResult(I iface, doesUserExist_args args) 
throws org.apache.thrift.TException {
+      public doesUserExist_result getResult(I iface, doesUserExist_args args) 
throws TException {
         doesUserExist_result result = new doesUserExist_result();
         try {
           result.success = iface.doesUserExist(args.userName, args.gatewayId);
@@ -822,7 +806,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public void start(I iface, addUserProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws 
TException {
+      public void start(I iface, addUserProfile_args args, 
AsyncMethodCallback<String> resultHandler) throws TException {
         iface.addUserProfile(args.userProfile,resultHandler);
       }
     }
@@ -880,7 +864,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public void start(I iface, updateUserProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+      public void start(I iface, updateUserProfile_args args, 
AsyncMethodCallback<Boolean> resultHandler) throws TException {
         iface.updateUserProfile(args.userProfile,resultHandler);
       }
     }
@@ -937,7 +921,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public void start(I iface, getUserProfileById_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.user.UserProfile>
 resultHandler) throws TException {
+      public void start(I iface, getUserProfileById_args args, 
AsyncMethodCallback<org.apache.airavata.model.user.UserProfile> resultHandler) 
throws TException {
         iface.getUserProfileById(args.userId, args.gatewayId,resultHandler);
       }
     }
@@ -995,7 +979,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public void start(I iface, deleteUserProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+      public void start(I iface, deleteUserProfile_args args, 
AsyncMethodCallback<Boolean> resultHandler) throws TException {
         iface.deleteUserProfile(args.userId,resultHandler);
       }
     }
@@ -1052,7 +1036,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public void start(I iface, getAllUserProfilesInGateway_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.user.UserProfile>>
 resultHandler) throws TException {
+      public void start(I iface, getAllUserProfilesInGateway_args args, 
AsyncMethodCallback<List<org.apache.airavata.model.user.UserProfile>> 
resultHandler) throws TException {
         iface.getAllUserProfilesInGateway(args.gatewayId, args.offset, 
args.limit,resultHandler);
       }
     }
@@ -1109,7 +1093,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public void start(I iface, getUserProfileByName_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.user.UserProfile>
 resultHandler) throws TException {
+      public void start(I iface, getUserProfileByName_args args, 
AsyncMethodCallback<org.apache.airavata.model.user.UserProfile> resultHandler) 
throws TException {
         iface.getUserProfileByName(args.userName, 
args.gatewayId,resultHandler);
       }
     }
@@ -1167,7 +1151,7 @@ public class UserProfileCrudeService {
         return false;
       }
 
-      public void start(I iface, doesUserExist_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+      public void start(I iface, doesUserExist_args args, 
AsyncMethodCallback<Boolean> resultHandler) throws TException {
         iface.doesUserExist(args.userName, args.gatewayId,resultHandler);
       }
     }
@@ -1404,11 +1388,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
     }
 
@@ -1428,10 +1412,10 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       if (userProfile == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'userProfile' was not present! Struct: " + toString());
+        throw new TProtocolException("Required field 'userProfile' was not 
present! Struct: " + toString());
       }
       // check for sub-struct validity
       if (userProfile != null) {
@@ -1442,7 +1426,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -1450,7 +1434,7 @@ public class UserProfileCrudeService {
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -1463,7 +1447,7 @@ public class UserProfileCrudeService {
 
     private static class addUserProfile_argsStandardScheme extends 
StandardScheme<addUserProfile_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addUserProfile_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addUserProfile_args struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -1493,7 +1477,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addUserProfile_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addUserProfile_args struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -1517,13 +1501,13 @@ public class UserProfileCrudeService {
     private static class addUserProfile_argsTupleScheme extends 
TupleScheme<addUserProfile_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
addUserProfile_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
addUserProfile_args struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         struct.userProfile.write(oprot);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
addUserProfile_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
addUserProfile_args struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         struct.userProfile = new org.apache.airavata.model.user.UserProfile();
         struct.userProfile.read(iprot);
@@ -1837,11 +1821,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
       }
 
@@ -1869,7 +1853,7 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       // check for sub-struct validity
     }
@@ -1877,7 +1861,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -1885,7 +1869,7 @@ public class UserProfileCrudeService {
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -1898,7 +1882,7 @@ public class UserProfileCrudeService {
 
     private static class addUserProfile_resultStandardScheme extends 
StandardScheme<addUserProfile_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addUserProfile_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addUserProfile_result struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -1936,7 +1920,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addUserProfile_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addUserProfile_result struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -1965,7 +1949,7 @@ public class UserProfileCrudeService {
     private static class addUserProfile_resultTupleScheme extends 
TupleScheme<addUserProfile_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
addUserProfile_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
addUserProfile_result struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -1984,7 +1968,7 @@ public class UserProfileCrudeService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
addUserProfile_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
addUserProfile_result struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -2231,11 +2215,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
     }
 
@@ -2255,10 +2239,10 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       if (userProfile == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'userProfile' was not present! Struct: " + toString());
+        throw new TProtocolException("Required field 'userProfile' was not 
present! Struct: " + toString());
       }
       // check for sub-struct validity
       if (userProfile != null) {
@@ -2269,7 +2253,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -2277,7 +2261,7 @@ public class UserProfileCrudeService {
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -2290,7 +2274,7 @@ public class UserProfileCrudeService {
 
     private static class updateUserProfile_argsStandardScheme extends 
StandardScheme<updateUserProfile_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
updateUserProfile_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
updateUserProfile_args struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -2320,7 +2304,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
updateUserProfile_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
updateUserProfile_args struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -2344,13 +2328,13 @@ public class UserProfileCrudeService {
     private static class updateUserProfile_argsTupleScheme extends 
TupleScheme<updateUserProfile_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
updateUserProfile_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
updateUserProfile_args struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         struct.userProfile.write(oprot);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
updateUserProfile_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
updateUserProfile_args struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         struct.userProfile = new org.apache.airavata.model.user.UserProfile();
         struct.userProfile.read(iprot);
@@ -2666,11 +2650,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
       }
 
@@ -2694,7 +2678,7 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       // check for sub-struct validity
     }
@@ -2702,7 +2686,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -2712,7 +2696,7 @@ public class UserProfileCrudeService {
         // it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -2725,7 +2709,7 @@ public class UserProfileCrudeService {
 
     private static class updateUserProfile_resultStandardScheme extends 
StandardScheme<updateUserProfile_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
updateUserProfile_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
updateUserProfile_result struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -2763,7 +2747,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
updateUserProfile_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
updateUserProfile_result struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -2792,7 +2776,7 @@ public class UserProfileCrudeService {
     private static class updateUserProfile_resultTupleScheme extends 
TupleScheme<updateUserProfile_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
updateUserProfile_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
updateUserProfile_result struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -2811,7 +2795,7 @@ public class UserProfileCrudeService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
updateUserProfile_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
updateUserProfile_result struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -3132,11 +3116,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
     }
 
@@ -3164,13 +3148,13 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       if (userId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'userId' was not present! Struct: " + toString());
+        throw new TProtocolException("Required field 'userId' was not present! 
Struct: " + toString());
       }
       if (gatewayId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'gatewayId' was not present! Struct: " + toString());
+        throw new TProtocolException("Required field 'gatewayId' was not 
present! Struct: " + toString());
       }
       // check for sub-struct validity
     }
@@ -3178,7 +3162,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -3186,7 +3170,7 @@ public class UserProfileCrudeService {
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -3199,7 +3183,7 @@ public class UserProfileCrudeService {
 
     private static class getUserProfileById_argsStandardScheme extends 
StandardScheme<getUserProfileById_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getUserProfileById_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getUserProfileById_args struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -3236,7 +3220,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getUserProfileById_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getUserProfileById_args struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -3265,14 +3249,14 @@ public class UserProfileCrudeService {
     private static class getUserProfileById_argsTupleScheme extends 
TupleScheme<getUserProfileById_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getUserProfileById_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getUserProfileById_args struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         oprot.writeString(struct.userId);
         oprot.writeString(struct.gatewayId);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getUserProfileById_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getUserProfileById_args struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         struct.userId = iprot.readString();
         struct.setUserIdIsSet(true);
@@ -3587,11 +3571,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
       }
 
@@ -3619,7 +3603,7 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       // check for sub-struct validity
       if (success != null) {
@@ -3630,7 +3614,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -3638,7 +3622,7 @@ public class UserProfileCrudeService {
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -3651,7 +3635,7 @@ public class UserProfileCrudeService {
 
     private static class getUserProfileById_resultStandardScheme extends 
StandardScheme<getUserProfileById_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getUserProfileById_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getUserProfileById_result struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -3690,7 +3674,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getUserProfileById_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getUserProfileById_result struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -3719,7 +3703,7 @@ public class UserProfileCrudeService {
     private static class getUserProfileById_resultTupleScheme extends 
TupleScheme<getUserProfileById_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getUserProfileById_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getUserProfileById_result struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -3738,7 +3722,7 @@ public class UserProfileCrudeService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getUserProfileById_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getUserProfileById_result struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -3986,11 +3970,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
     }
 
@@ -4010,10 +3994,10 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       if (userId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'userId' was not present! Struct: " + toString());
+        throw new TProtocolException("Required field 'userId' was not present! 
Struct: " + toString());
       }
       // check for sub-struct validity
     }
@@ -4021,7 +4005,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -4029,7 +4013,7 @@ public class UserProfileCrudeService {
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -4042,7 +4026,7 @@ public class UserProfileCrudeService {
 
     private static class deleteUserProfile_argsStandardScheme extends 
StandardScheme<deleteUserProfile_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
deleteUserProfile_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
deleteUserProfile_args struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -4071,7 +4055,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
deleteUserProfile_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
deleteUserProfile_args struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -4095,13 +4079,13 @@ public class UserProfileCrudeService {
     private static class deleteUserProfile_argsTupleScheme extends 
TupleScheme<deleteUserProfile_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
deleteUserProfile_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
deleteUserProfile_args struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         oprot.writeString(struct.userId);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
deleteUserProfile_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
deleteUserProfile_args struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         struct.userId = iprot.readString();
         struct.setUserIdIsSet(true);
@@ -4416,11 +4400,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
       }
 
@@ -4444,7 +4428,7 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       // check for sub-struct validity
     }
@@ -4452,7 +4436,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -4462,7 +4446,7 @@ public class UserProfileCrudeService {
         // it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -4475,7 +4459,7 @@ public class UserProfileCrudeService {
 
     private static class deleteUserProfile_resultStandardScheme extends 
StandardScheme<deleteUserProfile_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
deleteUserProfile_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
deleteUserProfile_result struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -4513,7 +4497,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
deleteUserProfile_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
deleteUserProfile_result struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -4542,7 +4526,7 @@ public class UserProfileCrudeService {
     private static class deleteUserProfile_resultTupleScheme extends 
TupleScheme<deleteUserProfile_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
deleteUserProfile_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
deleteUserProfile_result struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -4561,7 +4545,7 @@ public class UserProfileCrudeService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
deleteUserProfile_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
deleteUserProfile_result struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -4958,11 +4942,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
     }
 
@@ -4990,10 +4974,10 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       if (gatewayId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'gatewayId' was not present! Struct: " + toString());
+        throw new TProtocolException("Required field 'gatewayId' was not 
present! Struct: " + toString());
       }
       // alas, we cannot check 'offset' because it's a primitive and you chose 
the non-beans generator.
       // alas, we cannot check 'limit' because it's a primitive and you chose 
the non-beans generator.
@@ -5003,7 +4987,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -5013,7 +4997,7 @@ public class UserProfileCrudeService {
         // it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -5026,7 +5010,7 @@ public class UserProfileCrudeService {
 
     private static class getAllUserProfilesInGateway_argsStandardScheme 
extends StandardScheme<getAllUserProfilesInGateway_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllUserProfilesInGateway_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllUserProfilesInGateway_args struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -5069,15 +5053,15 @@ public class UserProfileCrudeService {
 
         // check for required fields of primitive type, which can't be checked 
in the validate method
         if (!struct.isSetOffset()) {
-          throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'offset' was not found in serialized data! Struct: " + toString());
+          throw new TProtocolException("Required field 'offset' was not found 
in serialized data! Struct: " + toString());
         }
         if (!struct.isSetLimit()) {
-          throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'limit' was not found in serialized data! Struct: " + toString());
+          throw new TProtocolException("Required field 'limit' was not found 
in serialized data! Struct: " + toString());
         }
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllUserProfilesInGateway_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllUserProfilesInGateway_args struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -5107,7 +5091,7 @@ public class UserProfileCrudeService {
     private static class getAllUserProfilesInGateway_argsTupleScheme extends 
TupleScheme<getAllUserProfilesInGateway_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllUserProfilesInGateway_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllUserProfilesInGateway_args struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         oprot.writeString(struct.gatewayId);
         oprot.writeI32(struct.offset);
@@ -5115,7 +5099,7 @@ public class UserProfileCrudeService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllUserProfilesInGateway_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllUserProfilesInGateway_args struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         struct.gatewayId = iprot.readString();
         struct.setGatewayIdIsSet(true);
@@ -5452,11 +5436,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
       }
 
@@ -5484,7 +5468,7 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       // check for sub-struct validity
     }
@@ -5492,7 +5476,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -5500,7 +5484,7 @@ public class UserProfileCrudeService {
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -5513,7 +5497,7 @@ public class UserProfileCrudeService {
 
     private static class getAllUserProfilesInGateway_resultStandardScheme 
extends StandardScheme<getAllUserProfilesInGateway_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllUserProfilesInGateway_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllUserProfilesInGateway_result struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -5562,7 +5546,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllUserProfilesInGateway_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllUserProfilesInGateway_result struct) throws TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -5598,7 +5582,7 @@ public class UserProfileCrudeService {
     private static class getAllUserProfilesInGateway_resultTupleScheme extends 
TupleScheme<getAllUserProfilesInGateway_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllUserProfilesInGateway_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllUserProfilesInGateway_result struct) throws TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -5623,7 +5607,7 @@ public class UserProfileCrudeService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllUserProfilesInGateway_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllUserProfilesInGateway_result struct) throws TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -5954,11 +5938,11 @@ public class UserProfileCrudeService {
       return _Fields.findByThriftId(fieldId);
     }
 
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
TException {
       schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
     }
 
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
TException {
       schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
     }
 
@@ -5986,13 +5970,13 @@ public class UserProfileCrudeService {
       return sb.toString();
     }
 
-    public void validate() throws org.apache.thrift.TException {
+    public void validate() throws TException {
       // check for required fields
       if (userName == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'userName' was not present! Struct: " + toString());
+        throw new TProtocolException("Required field 'userName' was not 
present! Struct: " + toString());
       }
       if (gatewayId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'gatewayId' was not present! Struct: " + toString());
+        throw new TProtocolException("Required field 'gatewayId' was not 
present! Struct: " + toString());
       }
       // check for sub-struct validity
     }
@@ -6000,7 +5984,7 @@ public class UserProfileCrudeService {
     private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
       try {
         write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -6008,7 +5992,7 @@ public class UserProfileCrudeService {
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
+      } catch (TException te) {
         throw new java.io.IOException(te);
       }
     }
@@ -6021,7 +6005,7 @@ public class UserProfileCrudeService {
 
     private static class getUserProfileByName_argsStandardScheme extends 
StandardScheme<getUserProfileByName_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getUserProfileByName_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getUserProfileByName_args struct) throws TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -6058,7 +6042,7 @@ public class UserProfileCrudeService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getUserProfileByName_args struct) throws org.apache.thrift.TException {
+ 

<TRUNCATED>

Reply via email to