You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/01/11 22:09:04 UTC
[airavata] branch develop updated: Fixing calls to getAPIVersion()
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new f28f861 Fixing calls to getAPIVersion()
f28f861 is described below
commit f28f86170003308bcd4089332e886a3a3246bc9e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 11 17:08:44 2019 -0500
Fixing calls to getAPIVersion()
---
.../main/java/org/apache/airavata/client/samples/CreateLaunchBES.java | 2 +-
.../org/apache/airavata/client/samples/CreateLaunchExperiment.java | 4 ++--
.../org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java | 2 +-
.../java/org/apache/airavata/client/samples/ReplicaCatalogSample.java | 2 +-
.../java/org/apache/airavata/client/secure/client/SecureClient.java | 4 ++--
.../org/apache/airavata/client/tools/RegisterOGCEUS3Application.java | 2 +-
.../org/apache/airavata/client/tools/RegisterSampleApplications.java | 2 +-
.../java/org/apache/airavata/client/tools/RegisterUS3Application.java | 2 +-
.../src/test/java/org/apache/airavata/integration/BaseCaseIT.java | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
index 4985eb0..86ead78 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
@@ -70,7 +70,7 @@ public class CreateLaunchBES {
public static void main(String[] args) throws Exception {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + airavataClient.getAPIVersion(null));
+ System.out.println("API version is " + airavataClient.getAPIVersion());
// createGateway();
// getGateway("testGatewayId");
// registerApplications(); // run this only the first time
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 8de52f9..db23854 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -92,7 +92,7 @@ public class CreateLaunchExperiment {
public static void main(String[] args) throws Exception {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
AuthzToken token = new AuthzToken("empty_token");
- System.out.println("API version is " + airavataClient.getAPIVersion(token));
+ System.out.println("API version is " + airavataClient.getAPIVersion());
// registerApplications(); // run this only the first time
// Map<String, String> master = airavataClient.getAllUserSSHPubKeys(token, "master");
// System.out.println(master.size());
@@ -1576,4 +1576,4 @@ Monte Application Interface Id Tinker_Monte_f3949619-faf5-43d8-9c52-3ace4ca9f258
Gaussian Application Interface Id Gaussian_a212c1d7-75ca-46c1-b11a-c8d431b5f05f
#### Registering Ultrascan Application Interface ####
Ultrascan Application Interface Id Ultrascan_3749018d-2cee-407b-a7cd-fdf86d525ca5
-*/
\ No newline at end of file
+*/
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
index 89aeef3..6e81a24 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
@@ -53,7 +53,7 @@ public class CreateLaunchExperimentUS3 {
public static void main(String[] args) {
try {
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + airavata.getAPIVersion(null));
+ System.out.println("API version is " + airavata.getAPIVersion());
// addDescriptors();
// final String expId = createUS3ExperimentForTrestles(airavata);
final String expId = createUS3ExperimentForStampede(airavata);
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/ReplicaCatalogSample.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/ReplicaCatalogSample.java
index cc9c57e..01c4a68 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/ReplicaCatalogSample.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/ReplicaCatalogSample.java
@@ -40,7 +40,7 @@ public class ReplicaCatalogSample {
public static void main(String[] args) {
try {
client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println(client.getAPIVersion(authzToken));
+ System.out.println(client.getAPIVersion());
DataProductModel dataProductModel = new DataProductModel();
dataProductModel.setGatewayId(DEFAULT_GATEWAY);
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/secure/client/SecureClient.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/secure/client/SecureClient.java
index f75ed87..54dafb7 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/secure/client/SecureClient.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/secure/client/SecureClient.java
@@ -201,7 +201,7 @@ public class SecureClient {
authzToken.setClaimsMap(claimsMap);
if (methodNumber == 1) {
- String version = client.getAPIVersion(authzToken);
+ String version = client.getAPIVersion();
System.out.println("");
System.out.println("Airavata API version: " + version);
System.out.println("");
@@ -252,4 +252,4 @@ public class SecureClient {
}
-}
\ No newline at end of file
+}
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
index 36e74ec..3daa06c 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
@@ -66,7 +66,7 @@ public class RegisterOGCEUS3Application {
public static void main(String[] args) {
try {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + airavataClient.getAPIVersion(null));
+ System.out.println("API version is " + airavataClient.getAPIVersion());
//Register all compute hosts
registerXSEDEHosts();
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index ac01b24..a581417 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -148,7 +148,7 @@ public class RegisterSampleApplications {
public static void main(String[] args) {
try {
Airavata.Client airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + airavataClient.getAPIVersion(null));
+ System.out.println("API version is " + airavataClient.getAPIVersion());
RegisterSampleApplications registerSampleApplications = new RegisterSampleApplications(airavataClient);
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
index c0de65d..ea4951b 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
@@ -66,7 +66,7 @@ public class RegisterUS3Application {
public static void main(String[] args) {
try {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + airavataClient.getAPIVersion(null));
+ System.out.println("API version is " + airavataClient.getAPIVersion());
//Register all compute hosts
registerXSEDEHosts();
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
index 1efd174..48e4326 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
@@ -67,7 +67,7 @@ public class BaseCaseIT extends WorkflowIntegrationTestBase {
@Test(groups = {"setupTests"})
public void testSetup() throws Exception {
- String version = this.client.getAPIVersion(null);
+ String version = this.client.getAPIVersion();
Assert.assertNotNull(version);
log("Airavata version - " + version);