airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [01/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:42 GMT
Repository: airavata
Updated Branches:
  refs/heads/master bd97f809c -> eb4a737c5


http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
index 1fbaeea..b863e8c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
  * 
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class ComputationalResourceSchedulingModel implements org.apache.thrift.TBase<ComputationalResourceSchedulingModel,
ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, Comparable<ComputationalResourceSchedulingModel>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
index 2a6264d..02ee084 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class AuthzToken implements org.apache.thrift.TBase<AuthzToken, AuthzToken._Fields>,
java.io.Serializable, Cloneable, Comparable<AuthzToken> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthzToken");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
index fbdc394..1fd7d0b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
  *   User friendly reason on how the state is inferred.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<ExperimentStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
index 42a579d..ef54285 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<JobStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index 9b1fc3a..e338b4f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<ProcessStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
index 0603a67..2dc9600 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<TaskStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
index 5251520..dcb6c85 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
  *   A friendly description of the task, usally used to communicate information to users.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel,
DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index d7c35bc..1355124 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
  * subTaskModel:
  *   A generic byte object for the Task developer to store internal serialized data into
registry catalogs.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>,
java.io.Serializable, Cloneable, Comparable<TaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index e4d9466..4ba6f30 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>,
java.io.Serializable, Cloneable, Comparable<Gateway> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index 4ff7b33..65b4506 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable,
Cloneable, Comparable<Group> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 0ea46f7..007afcc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class Project implements org.apache.thrift.TBase<Project, Project._Fields>,
java.io.Serializable, Cloneable, Comparable<Project> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index d0e10bc..058b656 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
 public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable,
Cloneable, Comparable<User> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
index fbf5a47..f62b13d 100644
--- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
@@ -60,7 +60,7 @@ namespace js ApacheAiravataAPI
  *              in a change to major/minor version numbers.
  *
 */
-const string AIRAVATA_API_VERSION = "0.15.0"
+const string AIRAVATA_API_VERSION = "0.16.0"
 
 service Airavata {
 
@@ -201,22 +201,6 @@ service Airavata {
                   5: airavata_errors.AuthorizationException ae)
 
  /**
-   * Get all Project by user
-   *
-   * @param gatewayId
-   *    The identifier for the requested gateway.
-   *
-   * @param userName
-   *    The Project Object described in the workspace_model
-   * @deprecated Instead use getAllUserProjectsWithPagination
- **/
-  list<workspace_model.Project> getAllUserProjects (1: required string gatewayId,
-                                                    2: required string userName)
-        throws (1: airavata_errors.InvalidRequestException ire,
-                2: airavata_errors.AiravataClientException ace,
-                3: airavata_errors.AiravataSystemException ase)
-
- /**
    * Get all Project by user with pagination. Results will be ordered based
    * on creation time DESC
    *
@@ -229,7 +213,7 @@ service Airavata {
    * @param offset
    *    The starting point of the results to be fetched
  **/
-  list<workspace_model.Project> getAllUserProjectsWithPagination (1: required security_model.AuthzToken
authzToken,
+  list<workspace_model.Project> getUserProjects(1: required security_model.AuthzToken
authzToken,
                                                    2: required string gatewayId,
                                                    3: required string userName,
                                                    4: required i32 limit,
@@ -240,24 +224,6 @@ service Airavata {
                 4: airavata_errors.AuthorizationException ae)
 
   /**
-   * 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
-   */
-  list<workspace_model.Project> searchProjectsByProjectName (1: required string gatewayId,
-                        2: required string userName,
-                        3: required string projectName)
-          throws (1: airavata_errors.InvalidRequestException ire,
-                  2: airavata_errors.AiravataClientException ace,
-                  3: airavata_errors.AiravataSystemException ase)
-
-  /**
    * Get all Project for user by project name with pagination.Results will be ordered based
    * on creation time DESC
    *
@@ -272,7 +238,7 @@ service Airavata {
    * @param offset
    *    The starting point of the results to be fetched
   */
-  list<workspace_model.Project> searchProjectsByProjectNameWithPagination (1: required
security_model.AuthzToken authzToken,
+  list<workspace_model.Project> searchProjectsByProjectName (1: required security_model.AuthzToken
authzToken,
                         2: required string gatewayId,
                         3: required string userName,
                         4: required string projectName,
@@ -284,22 +250,6 @@ service Airavata {
                   4: airavata_errors.AuthorizationException ae)
 
   /**
-    * 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
-  */
-  list<workspace_model.Project> searchProjectsByProjectDesc (1: required string gatewayId,
-                        2: required string userName, 3: required string description)
-            throws (1: airavata_errors.InvalidRequestException ire,
-                    2: airavata_errors.AiravataClientException ace,
-                    3: airavata_errors.AiravataSystemException ase)
-
-  /**
     * Search and get all Projects for user by project description with pagination. Results
     * will be ordered based on creation time DESC
     *
@@ -314,7 +264,7 @@ service Airavata {
     * @param offset
     *    The starting point of the results to be fetched
    */
-  list<workspace_model.Project> searchProjectsByProjectDescWithPagination (1: required
security_model.AuthzToken authzToken,
+  list<workspace_model.Project> searchProjectsByProjectDesc(1: required security_model.AuthzToken
authzToken,
                         2: required string gatewayId,
                         3: required string userName,
                         4: required string description,
@@ -325,26 +275,6 @@ service Airavata {
                     3: airavata_errors.AiravataSystemException ase,
                     4: airavata_errors.AuthorizationException ae)
 
-
-  /**
-    * Search Experiments by experiment name
-    *
-    * @param gatewayId
-    *       Identifier of the requested gateway
-    * @param useNname
-    *       Username of the requested user
-    * @param expName
-    *       Experiment name to be matched
-    * @deprecated
-    *       Instead use searchExperimentsByNameWithPagination
-    *
-    */
-  list<experiment_model.ExperimentSummaryModel> searchExperimentsByName (1: required
string gatewayId,
-                          2: required string userName, 3: required string expName)
-            throws (1: airavata_errors.InvalidRequestException ire,
-                    2: airavata_errors.AiravataClientException ace,
-                    3: airavata_errors.AiravataSystemException ase)
-
   /**
     * Search Experiments by experiment name with pagination. Results will be sorted
     * based on creation time DESC
@@ -360,7 +290,7 @@ service Airavata {
     * @param offset
     *       The starting point of the results to be fetched
     */
-  list<experiment_model.ExperimentSummaryModel> searchExperimentsByNameWithPagination
(1: required security_model.AuthzToken authzToken,
+  list<experiment_model.ExperimentSummaryModel> searchExperimentsByName(1: required
security_model.AuthzToken authzToken,
                           2: required string gatewayId,
                           3: required string userName,
                           4: required string expName,
@@ -372,24 +302,6 @@ service Airavata {
                     4: airavata_errors.AuthorizationException ae)
 
   /**
-    * 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
-  */
-  list<experiment_model.ExperimentSummaryModel> searchExperimentsByDesc (1: required
string gatewayId,
-                            2: required string userName, 3: required string description)
-              throws (1: airavata_errors.InvalidRequestException ire,
-                      2: airavata_errors.AiravataClientException ace,
-                      3: airavata_errors.AiravataSystemException ase)
-
-  /**
     * Search Experiments by experiment name with pagination. Results will be sorted
     * based on creation time DESC
     *
@@ -404,7 +316,7 @@ service Airavata {
     * @param offset
     *       The starting point of the results to be fetched
     */
-  list<experiment_model.ExperimentSummaryModel> searchExperimentsByDescWithPagination
(1: required security_model.AuthzToken authzToken,
+  list<experiment_model.ExperimentSummaryModel> searchExperimentsByDesc(1: required
security_model.AuthzToken authzToken,
                             2: required string gatewayId,
                             3: required string userName,
                             4: required string description,
@@ -415,24 +327,6 @@ service Airavata {
                       3: airavata_errors.AiravataSystemException ase,
                       4: airavata_errors.AuthorizationException ae)
 
-
-  /**
-   * 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 searchExperimentsByApplicationWithPagination
-   */
-  list<experiment_model.ExperimentSummaryModel> searchExperimentsByApplication (1:
required string gatewayId,
-                             2: required string userName, 3: required string applicationId)
-              throws (1: airavata_errors.InvalidRequestException ire,
-                      2: airavata_errors.AiravataClientException ace,
-                      3: airavata_errors.AiravataSystemException ase)
   /**
    * Search Experiments by application id with pagination. Results will be sorted
    * based on creation time DESC
@@ -448,7 +342,7 @@ service Airavata {
    * @param offset
    *       The starting point of the results to be fetched
    */
-  list<experiment_model.ExperimentSummaryModel> searchExperimentsByApplicationWithPagination
(1: required security_model.AuthzToken authzToken,
+  list<experiment_model.ExperimentSummaryModel> searchExperimentsByApplication(1: required
security_model.AuthzToken authzToken,
                              2: required string gatewayId,
                              3: required string userName,
                              4: required string applicationId,
@@ -458,23 +352,6 @@ service Airavata {
                       2: airavata_errors.AiravataClientException ace,
                       3: airavata_errors.AiravataSystemException ase,
                       4: airavata_errors.AuthorizationException ae)
-   /**
-    * Search Experiments by experiment status
-    *
-    * @param gatewayId
-    *       Identifier of the requested gateway
-    * @param userName
-    *       Username of the requested user
-    * @param experimentState
-    *       Experiement state to be matched
-    * @deprecated
-    *       Instead use searchExperimentsByStatusWithPagination
-    */
-    list<experiment_model.ExperimentSummaryModel> searchExperimentsByStatus (1: required
string gatewayId,
-                            2: required string userName, 3: required status_models.ExperimentState
experimentState)
-                throws (1: airavata_errors.InvalidRequestException ire,
-                        2: airavata_errors.AiravataClientException ace,
-                        3: airavata_errors.AiravataSystemException ase)
 
   /**
    * Search Experiments by experiment status with pagination. Results will be sorted
@@ -491,7 +368,7 @@ service Airavata {
    * @param offset
    *       The starting point of the results to be fetched
    */
-    list<experiment_model.ExperimentSummaryModel> searchExperimentsByStatusWithPagination
(1: required security_model.AuthzToken authzToken,
+    list<experiment_model.ExperimentSummaryModel> searchExperimentsByStatus(1: required
security_model.AuthzToken authzToken,
                             2: required string gatewayId,
                             3: required string userName,
                             4: required status_models.ExperimentState experimentState,
@@ -503,26 +380,6 @@ service Airavata {
                         4: airavata_errors.AuthorizationException ae)
 
   /**
-   * 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 searchExperimentsByCreationTimeWithPagination
-   */
-    list<experiment_model.ExperimentSummaryModel> searchExperimentsByCreationTime (1:
required string gatewayId,
-                            2: required string userName, 3: required i64 fromTime, 4: required
i64 toTime)
-                throws (1: airavata_errors.InvalidRequestException ire,
-                        2: airavata_errors.AiravataClientException ace,
-                        3: airavata_errors.AiravataSystemException ase)
-
-  /**
    * Search Experiments by experiment creation time with pagination. Results will be sorted
    * based on creation time DESC
    *
@@ -539,7 +396,7 @@ service Airavata {
    * @param offset
    *       The starting point of the results to be fetched
    */
-    list<experiment_model.ExperimentSummaryModel> searchExperimentsByCreationTimeWithPagination
(1: required security_model.AuthzToken authzToken,
+    list<experiment_model.ExperimentSummaryModel> searchExperimentsByCreationTime(1:
required security_model.AuthzToken authzToken,
                             2: required string gatewayId,
                             3: required string userName,
                             4: required i64 fromTime,
@@ -595,22 +452,9 @@ service Airavata {
                         3: airavata_errors.AiravataSystemException ase,
                         4: airavata_errors.AuthorizationException ae)
 
-   /**
-    * Get all Experiments within a Project
-    *
-    * @param projectId
-    *       Identifier of the project
-    * @deprecated
-    *       Instead use  getAllExperimentsInProjectWithPagination
-    */
-  list<experiment_model.ExperimentModel> getAllExperimentsInProject(1: required string
projectId)
-          throws (1: airavata_errors.InvalidRequestException ire,
-                  2: airavata_errors.AiravataClientException ace,
-                  3: airavata_errors.AiravataSystemException ase,
-                  4: airavata_errors.ProjectNotFoundException pnfe)
 
   /**
-   * 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
@@ -620,7 +464,7 @@ service Airavata {
    * @param offset
    *       The starting point of the results to be fetched
    */
-  list<experiment_model.ExperimentModel> getAllExperimentsInProjectWithPagination(1:
required security_model.AuthzToken authzToken,
+  list<experiment_model.ExperimentModel> getExperimentsInProject(1: required security_model.AuthzToken
authzToken,
                   2: required string projectId,
                   3: required i32 limit,
                   4: required i32 offset)
@@ -630,25 +474,8 @@ service Airavata {
                   4: airavata_errors.ProjectNotFoundException pnfe,
                   5: airavata_errors.AuthorizationException ae)
 
-
-  /**
-   * Get all Experiments by user
-   *
-   * @param gatewayId
-   *       Identifier of the requesting gateway
-   * @param userName
-   *       Username of the requested user
-   * @deprecated
-   *       Instead use getAllUserExperimentsWithPagination
-   */
-  list<experiment_model.ExperimentModel> getAllUserExperiments(1: required string gatewayId,
-                        2: required string userName)
-            throws (1: airavata_errors.InvalidRequestException ire,
-                    2: airavata_errors.AiravataClientException ace,
-                    3: airavata_errors.AiravataSystemException ase)
-
   /**
-   * Get all Experiments by user pagination. Results will be sorted
+   * Get experiments by user with pagination. Results will be sorted
    * based on creation time DESC
    *
    * @param gatewayId
@@ -660,7 +487,7 @@ service Airavata {
    * @param offset
    *       The starting point of the results to be fetched
    */
-  list<experiment_model.ExperimentModel> getAllUserExperimentsWithPagination(1: required
security_model.AuthzToken authzToken,
+  list<experiment_model.ExperimentModel> getUserExperiments(1: required security_model.AuthzToken
authzToken,
                         2: required string gatewayId,
                         3: required string userName,
                         4: required i32 limit,


Mime
View raw message