airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [11/13] airavata git commit: removing non paginated versions of API methods for project and experiment retrieval, from Airavata API
Date Sun, 02 Aug 2015 20:42:52 GMT
removing non paginated versions of API methods for project and experiment retrieval, from Airavata
API


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

Branch: refs/heads/master
Commit: dc61c676067c8a08b8ddccf314fda3e9435089c0
Parents: bd97f80
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Mon Aug 3 02:00:06 2015 +0530
Committer: Supun Nakandala <scnakandala@apache.org>
Committed: Mon Aug 3 02:00:10 2015 +0530

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |   206 +-
 .../java/org/apache/airavata/api/Airavata.java  | 27024 ++++-------------
 .../airavata/api/airavata_apiConstants.java     |     2 +-
 .../main/resources/lib/airavata/Airavata.cpp    |  7956 ++---
 .../src/main/resources/lib/airavata/Airavata.h  |  3388 +--
 .../lib/airavata/Airavata_server.skeleton.cpp   |   244 +-
 .../lib/airavata/airavata_api_constants.cpp     |     2 +-
 .../resources/lib/Airavata/API/Airavata.php     |  6349 +---
 .../main/resources/lib/Airavata/API/Types.php   |     2 +-
 .../lib/apache/airavata/api/Airavata-remote     |   136 +-
 .../lib/apache/airavata/api/Airavata.py         |  5120 +---
 .../lib/apache/airavata/api/constants.py        |     2 +-
 .../client/samples/CreateLaunchBES.java         |    14 +-
 .../client/samples/CreateLaunchExperiment.java  |    14 +-
 .../org/apache/airavata/model/Workflow.java     |     2 +-
 .../ApplicationDeploymentDescription.java       |     2 +-
 .../appdeployment/ApplicationModule.java        |     2 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   |     2 +-
 .../ApplicationInterfaceDescription.java        |     2 +-
 .../appcatalog/computeresource/BatchQueue.java  |     2 +-
 .../computeresource/CloudJobSubmission.java     |     2 +-
 .../ComputeResourceDescription.java             |     2 +-
 .../computeresource/DataMovementInterface.java  |     2 +-
 .../computeresource/GlobusJobSubmission.java    |     2 +-
 .../computeresource/GridFTPDataMovement.java    |     2 +-
 .../computeresource/JobSubmissionInterface.java |     2 +-
 .../computeresource/LOCALDataMovement.java      |     2 +-
 .../computeresource/LOCALSubmission.java        |     2 +-
 .../computeresource/ResourceJobManager.java     |     2 +-
 .../computeresource/SCPDataMovement.java        |     2 +-
 .../computeresource/SSHJobSubmission.java       |     2 +-
 .../computeresource/UnicoreDataMovement.java    |     2 +-
 .../computeresource/UnicoreJobSubmission.java   |     2 +-
 .../ComputeResourcePreference.java              |     2 +-
 .../gatewayprofile/GatewayResourceProfile.java  |     2 +-
 .../application/io/InputDataObjectType.java     |     2 +-
 .../application/io/OutputDataObjectType.java    |     2 +-
 .../airavata/model/commons/ErrorModel.java      |     2 +-
 .../model/commons/ValidationResults.java        |     2 +-
 .../airavata/model/commons/ValidatorResult.java |     2 +-
 .../model/error/AiravataClientException.java    |     2 +-
 .../model/error/AiravataSystemException.java    |     2 +-
 .../model/error/AuthenticationException.java    |     2 +-
 .../model/error/AuthorizationException.java     |     2 +-
 .../error/ExperimentNotFoundException.java      |     2 +-
 .../model/error/InvalidRequestException.java    |     2 +-
 .../model/error/LaunchValidationException.java  |     2 +-
 .../model/error/ProjectNotFoundException.java   |     2 +-
 .../airavata/model/error/TimedOutException.java |     2 +-
 .../airavata/model/error/ValidationResults.java |     2 +-
 .../airavata/model/error/ValidatorResult.java   |     2 +-
 .../model/experiment/ExperimentModel.java       |     2 +-
 .../model/experiment/ExperimentStatistics.java  |     2 +-
 .../experiment/ExperimentSummaryModel.java      |     2 +-
 .../experiment/UserConfigurationDataModel.java  |     2 +-
 .../org/apache/airavata/model/job/JobModel.java |     2 +-
 .../event/ExperimentStatusChangeEvent.java      |     2 +-
 .../model/messaging/event/JobIdentifier.java    |     2 +-
 .../messaging/event/JobStatusChangeEvent.java   |     2 +-
 .../event/JobStatusChangeRequestEvent.java      |     2 +-
 .../airavata/model/messaging/event/Message.java |     2 +-
 .../messaging/event/ProcessIdentifier.java      |     2 +-
 .../event/ProcessStatusChangeEvent.java         |     2 +-
 .../event/ProcessStatusChangeRequestEvent.java  |     2 +-
 .../messaging/event/ProcessSubmitEvent.java     |     2 +-
 .../messaging/event/ProcessTerminateEvent.java  |     2 +-
 .../model/messaging/event/TaskIdentifier.java   |     2 +-
 .../messaging/event/TaskOutputChangeEvent.java  |     2 +-
 .../messaging/event/TaskStatusChangeEvent.java  |     2 +-
 .../event/TaskStatusChangeRequestEvent.java     |     2 +-
 .../airavata/model/process/ProcessModel.java    |     2 +-
 .../ComputationalResourceSchedulingModel.java   |     2 +-
 .../airavata/model/security/AuthzToken.java     |     2 +-
 .../airavata/model/status/ExperimentStatus.java |     2 +-
 .../apache/airavata/model/status/JobStatus.java |     2 +-
 .../airavata/model/status/ProcessStatus.java    |     2 +-
 .../airavata/model/status/TaskStatus.java       |     2 +-
 .../model/task/DataStagingTaskModel.java        |     2 +-
 .../apache/airavata/model/task/TaskModel.java   |     2 +-
 .../airavata/model/workspace/Gateway.java       |     2 +-
 .../apache/airavata/model/workspace/Group.java  |     2 +-
 .../airavata/model/workspace/Project.java       |     2 +-
 .../apache/airavata/model/workspace/User.java   |     2 +-
 .../airavata-api/airavata_api.thrift            |   199 +-
 84 files changed, 11247 insertions(+), 39549 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 56af290..50097a1 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -357,21 +357,6 @@ public class AiravataServerHandler implements Airavata.Iface {
         }
     }
 
-    /**
-     * Get all Project by user
-     *
-     * @param gatewayId
-     *    The identifier for the requested gateway.
-     * @param userName
-     *    The identifier of the user
-     * @deprecated  Instead use getAllUserProjectsWithPagination method
-     */
-    @Deprecated
-    @Override
-    public List<Project> getAllUserProjects(String gatewayId, String userName) throws
InvalidRequestException,
-            AiravataClientException, AiravataSystemException, TException {
-        return getAllUserProjectsWithPagination(new AuthzToken(""), gatewayId, userName,
-1, -1);
-    }
 
     /**
      * Get all Project by user with pagination. Results will be ordered based
@@ -388,7 +373,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      **/
     @Override
     @SecurityCheck
-    public List<Project> getAllUserProjectsWithPagination(AuthzToken authzToken, String
gatewayId, String userName,
+    public List<Project> getUserProjects(AuthzToken authzToken, String gatewayId, String
userName,
                                                           int limit, int offset)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException,
AuthorizationException, TException {
         if (!validateString(userName)){
@@ -433,24 +418,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Get all Project for user by project name
-     *
-     * @param gatewayId
-     *    The identifier for the requested gateway.
-     * @param userName
-     *    The identifier of the user
-     * @param projectName
-     *    The name of the project on which the results to be fetched
-     * @deprecated Instead use searchProjectsByProjectNameWithPagination
-     */
-    @Deprecated
-    @Override
-    public List<Project> searchProjectsByProjectName(String gatewayId, String userName,
String projectName)
-            throws InvalidRequestException, AiravataClientException, AiravataSystemException,
TException {
-        return searchProjectsByProjectNameWithPagination(new AuthzToken(""), gatewayId, userName,
projectName, -1, -1);
-    }
-
-    /**
      * Get all Project for user by project name with pagination. Results will be ordered
based
      * on creation time DESC
      *
@@ -467,7 +434,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<Project> searchProjectsByProjectNameWithPagination(AuthzToken authzToken,
String gatewayId, String userName,
+    public List<Project> searchProjectsByProjectName(AuthzToken authzToken, String
gatewayId, String userName,
                                                                    String projectName, int
limit, int offset)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException,
AuthorizationException, TException {
         if (!validateString(userName)){
@@ -511,25 +478,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Get all Project for user by project description
-     * @param gatewayId
-     *    The identifier for the requested gateway.
-     * @param userName
-     *    The identifier of the user
-     * @param description
-     *    The description to be matched
-     * @deprecated Instead use searchProjectsByProjectDescWithPagination
-     */
-    @Deprecated
-    @Override
-    public List<Project> searchProjectsByProjectDesc(String gatewayId, String userName,
String description) throws InvalidRequestException,
-                                                                                        
        AiravataClientException,
-                                                                                        
        AiravataSystemException,
-                                                                                        
        TException {
-        return searchProjectsByProjectDescWithPagination(new AuthzToken(""), gatewayId, userName,
description, -1, -1);
-    }
-
-    /**
      * Search and get all Projects for user by project description with pagination. Results
      * will be ordered based on creation time DESC
      *
@@ -546,7 +494,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<Project> searchProjectsByProjectDescWithPagination(AuthzToken authzToken,
String gatewayId, String userName,
+    public List<Project> searchProjectsByProjectDesc(AuthzToken authzToken, String
gatewayId, String userName,
                                                                    String description, int
limit, int offset) throws InvalidRequestException,
             AiravataClientException, AiravataSystemException, AuthorizationException, TException
{
         if (!validateString(userName)){
@@ -590,26 +538,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Search Experiments by experiment name
-     *
-     * @param gatewayId
-     *       Identifier of the requested gateway
-     * @param userName
-     *       Username of the requested user
-     * @param expName
-     *       Experiment name to be matched
-     * @deprecated
-     *       Instead use searchExperimentsByNameWithPagination
-     *
-     */
-    @Deprecated
-    @Override
-    public List<ExperimentSummaryModel> searchExperimentsByName(String gatewayId, String
userName, String expName)
-            throws InvalidRequestException, AiravataClientException, AiravataSystemException,
TException {
-        return searchExperimentsByNameWithPagination(new AuthzToken(""), gatewayId, userName,
expName, -1, -1);
-    }
-
-    /**
      * Search Experiments by experiment name with pagination. Results will be sorted
      * based on creation time DESC
      *
@@ -626,7 +554,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<ExperimentSummaryModel> searchExperimentsByNameWithPagination(AuthzToken
authzToken, String gatewayId, String userName,
+    public List<ExperimentSummaryModel> searchExperimentsByName(AuthzToken authzToken,
String gatewayId, String userName,
                                                                               String expName,
int limit, int offset)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException,
AuthorizationException, TException {
         if (!validateString(userName)){
@@ -670,25 +598,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Search Experiments by experiment name
-     *
-     * @param gatewayId
-     *       Identifier of the requested gateway
-     * @param userName
-     *       Username of the requested user
-     * @param description
-     *       Experiment description to be matched
-     * @deprecated
-     *       Instead use searchExperimentsByDescWithPagination
-     */
-    @Deprecated
-    @Override
-    public List<ExperimentSummaryModel> searchExperimentsByDesc(String gatewayId, String
userName, String description)
-            throws InvalidRequestException, AiravataClientException, AiravataSystemException,
TException {
-        return searchExperimentsByDescWithPagination(new AuthzToken(""), gatewayId, userName,
description, -1, -1);
-    }
-
-    /**
      * Search Experiments by experiment name with pagination. Results will be sorted
      * based on creation time DESC
      *
@@ -705,7 +614,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<ExperimentSummaryModel> searchExperimentsByDescWithPagination(AuthzToken
authzToken, String gatewayId, String userName,
+    public List<ExperimentSummaryModel> searchExperimentsByDesc(AuthzToken authzToken,
String gatewayId, String userName,
                                                                               String description,
int limit, int offset)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException,
AuthorizationException, TException {
         if (!validateString(userName)){
@@ -749,25 +658,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Search Experiments by application id
-     *
-     * @param gatewayId
-     *       Identifier of the requested gateway
-     * @param userName
-     *       Username of the requested user
-     * @param applicationId
-     *       Application id to be matched
-     * @deprecated
-     *       Instead use searchExperimentsByApplication
-     */
-    @Deprecated
-    @Override
-    public List<ExperimentSummaryModel> searchExperimentsByApplication(String gatewayId,
String userName, String applicationId)
-            throws InvalidRequestException, AiravataClientException, AiravataSystemException,
TException {
-        return searchExperimentsByApplicationWithPagination(new AuthzToken(""), gatewayId,
userName, applicationId, -1, -1);
-    }
-
-    /**
      * Search Experiments by application id with pagination. Results will be sorted
      * based on creation time DESC
      *
@@ -784,7 +674,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<ExperimentSummaryModel> searchExperimentsByApplicationWithPagination(AuthzToken
authzToken, String gatewayId,
+    public List<ExperimentSummaryModel> searchExperimentsByApplication(AuthzToken authzToken,
String gatewayId,
                                                                                      String
userName, String applicationId,
                                                                                      int
limit, int offset)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException,
AuthorizationException, TException {
@@ -829,24 +719,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Search Experiments by experiment status
-     *
-     * @param gatewayId
-     *       Identifier of the requested gateway
-     * @param userName
-     *       Username of the requested user
-     * @param experimentState
-     *       Experiment state to be matched
-     * @deprecated
-     *       Instead use searchExperimentsByStatusWithPagination
-     */
-    @Deprecated
-    @Override
-    public List<ExperimentSummaryModel> searchExperimentsByStatus(String gatewayId,
String userName, ExperimentState experimentState) throws InvalidRequestException, AiravataClientException,
AiravataSystemException, TException {
-        return searchExperimentsByStatusWithPagination(new AuthzToken(""), gatewayId, userName,
experimentState, -1, -1);
-    }
-
-    /**
      * Search Experiments by experiment status with pagination. Results will be sorted
      * based on creation time DESC
      *
@@ -863,7 +735,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<ExperimentSummaryModel> searchExperimentsByStatusWithPagination(AuthzToken
authzToken, String gatewayId,
+    public List<ExperimentSummaryModel> searchExperimentsByStatus(AuthzToken authzToken,
String gatewayId,
                                                                                 String userName,
ExperimentState experimentState,
                                                                                 int limit,
int offset)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException,
AuthorizationException, TException {
@@ -908,26 +780,6 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Search Experiments by experiment creation time
-     *
-     * @param gatewayId
-     *       Identifier of the requested gateway
-     * @param userName
-     *       Username of the requested user
-     * @param fromTime
-     *       Start time of the experiments creation time
-     * @param toTime
-     *       End time of the  experiement creation time
-     * @deprecated
-     *       Instead use searchExperimentsByCreationTime
-     */
-    @Deprecated
-    @Override
-    public List<ExperimentSummaryModel> searchExperimentsByCreationTime(String gatewayId,
String userName, long fromTime, long toTime) throws InvalidRequestException, AiravataClientException,
AiravataSystemException, TException {
-        return searchExperimentsByCreationTimeWithPagination(new AuthzToken(""), gatewayId,
userName, fromTime, toTime, -1, -1);
-    }
-
-    /**
      * Search Experiments by experiment creation time with pagination. Results will be sorted
      * based on creation time DESC
      *
@@ -946,7 +798,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<ExperimentSummaryModel> searchExperimentsByCreationTimeWithPagination(AuthzToken
authzToken, String gatewayId,
+    public List<ExperimentSummaryModel> searchExperimentsByCreationTime(AuthzToken
authzToken, String gatewayId,
                                                                                       String
userName, long fromTime,
                                                                                       long
toTime, int limit, int offset)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException,
AuthorizationException, TException {
@@ -1105,25 +957,7 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Get all Experiments within a Project
-     *
-     * @param projectId
-     *       Identifier of the project
-     * @deprecated
-     *       Instead use getAllExperimentsInProjectWithPagination
-     */
-    @Deprecated
-    @Override
-    public List<ExperimentModel> getAllExperimentsInProject(String projectId) throws
InvalidRequestException,
-                                                                                AiravataClientException,
-                                                                                AiravataSystemException,
-                                                                                ProjectNotFoundException,
-                                                                                TException
{
-        return getAllExperimentsInProjectWithPagination(new AuthzToken(""), projectId, -1,
-1);
-    }
-
-    /**
-     * Get all Experiments within project with pagination. Results will be sorted
+     * Get Experiments within project with pagination. Results will be sorted
      * based on creation time DESC
      *
      * @param projectId
@@ -1135,7 +969,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<ExperimentModel> getAllExperimentsInProjectWithPagination(AuthzToken
authzToken, String projectId, int limit, int offset)
+    public List<ExperimentModel> getExperimentsInProject(AuthzToken authzToken, String
projectId, int limit, int offset)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException,
ProjectNotFoundException,
             AuthorizationException, TException {
         if (!validateString(projectId)){
@@ -1173,23 +1007,7 @@ public class AiravataServerHandler implements Airavata.Iface {
     }
 
     /**
-     * Get all Experiments by user
-     *
-     * @param gatewayId
-     *       Identifier of the requesting gateway
-     * @param userName
-     *       Username of the requested user
-     * @deprecated
-     *       Instead use getAllUserExperimentsWithPagination
-     */
-    @Deprecated
-    @Override
-    public List<ExperimentModel> getAllUserExperiments(String gatewayId, String userName)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException
{
-        return getAllUserExperimentsWithPagination(new AuthzToken(""), gatewayId, userName,
-1, -1);
-    }
-
-    /**
-     * Get all Experiments by user pagination. Results will be sorted
+     * Get Experiments by user pagination. Results will be sorted
      * based on creation time DESC
      *
      * @param gatewayId
@@ -1203,7 +1021,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public List<ExperimentModel> getAllUserExperimentsWithPagination(AuthzToken authzToken,
String gatewayId, String userName, int limit,
+    public List<ExperimentModel> getUserExperiments(AuthzToken authzToken, String gatewayId,
String userName, int limit,
                                                                      int offset) throws InvalidRequestException,
             AiravataClientException, AiravataSystemException, AuthorizationException, TException
{
         if (!validateString(userName)){


Mime
View raw message