[ARVADOS] updated: 2e04dd8e9f872506922744dd449cccb99b55a847
git at public.curoverse.com
git at public.curoverse.com
Sat May 3 17:06:50 EDT 2014
Summary of changes:
...SDKJavaUser.java => ArvadosSDKJavaExample.java} | 60 ++++++++------------
sdk/java/README | 12 ++--
.../main/java/org/arvados/sdk/java/Arvados.java | 6 ++-
.../java/org/arvados/sdk/java/ArvadosTest.java | 33 ++++++++++-
4 files changed, 66 insertions(+), 45 deletions(-)
rename sdk/java/{ArvadosSDKJavaUser.java => ArvadosSDKJavaExample.java} (63%)
via 2e04dd8e9f872506922744dd449cccb99b55a847 (commit)
via 752bd0d292c7fd6eb55b39cdc9d7373c7f35e0ec (commit)
from 67c754c065dbe79e14a3c60640e6e604af32d0bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 2e04dd8e9f872506922744dd449cccb99b55a847
Author: radhika <radhika at curoverse.com>
Date: Sat May 3 17:06:20 2014 -0400
2525: Rename ArvadosSDKJavaUser.java as ArvadosSDKJavaExample.java
diff --git a/sdk/java/ArvadosSDKJavaUser.java b/sdk/java/ArvadosSDKJavaExample.java
similarity index 63%
rename from sdk/java/ArvadosSDKJavaUser.java
rename to sdk/java/ArvadosSDKJavaExample.java
index 79b2c2d..8a28e25 100644
--- a/sdk/java/ArvadosSDKJavaUser.java
+++ b/sdk/java/ArvadosSDKJavaExample.java
@@ -8,9 +8,9 @@
import java.io.File;
import java.io.BufferedWriter;
import java.io.FileWriter;
-
-import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.arvados.sdk.java.Arvados;
import org.json.simple.JSONObject;
@@ -18,7 +18,7 @@ import org.json.simple.parser.JSONParser;
import com.google.api.services.discovery.model.RestDescription;
-public class ArvadosSDKJavaUser {
+public class ArvadosSDKJavaExample {
/** Make sure the following environment variables are set before using Arvados:
* ARVADOS_API_TOKEN, ARVADOS_API_HOST, ARVADOS_API_HOST_INSECURE
*/
@@ -36,14 +36,9 @@ public class ArvadosSDKJavaUser {
// Make a users.list call
System.out.println("Making an arvados users.list api call");
- List<String> params = new ArrayList<String>();
- params = new ArrayList<String>();
- params.add("call");
- params.add("arvados");
- params.add("v1");
- params.add("users.list");
+ Map<String, Object> params = new HashMap<String, Object>();
- String response = arv.call(params);
+ String response = arv.call("users", "list", params);
System.out.println("Arvados users.list:\n" + response);
// get uuid of the first user from the response
@@ -56,43 +51,34 @@ public class ArvadosSDKJavaUser {
String userUuid = (String)firstUser.get("uuid");
// Make a users.get call on the uuid obtained above
- System.out.println("Making a users.get for " + userUuid);
- params = new ArrayList<String>();
- params.add("call");
- params.add("arvados");
- params.add("v1");
- params.add("users.get");
- params.add(userUuid);
- response = arv.call(params);
+ System.out.println("Making a users.get call for " + userUuid);
+ params = new HashMap<String, Object>();
+ params.put("uuid", userUuid);
+ response = arv.call("users", "get", params);
System.out.println("Arvados users.get:\n" + response);
// Make a users.create call
System.out.println("Making a users.create call.");
- File file = new File("/tmp/arvados_test.json");
- BufferedWriter output = new BufferedWriter(new FileWriter(file));
- output.write("{}");
- output.close();
- String filePath = file.getPath();
-
- params = new ArrayList<String>();
- params.add("call");
- params.add("arvados");
- params.add("v1");
- params.add("users.create");
- params.add(filePath);
- response = arv.call(params);
+ params = new HashMap<String, Object>();
+ params.put("user", "{}");
+ response = arv.call("users", "create", params);
System.out.println("Arvados users.create:\n" + response);
+ // delete the newly created user
+ parser = new JSONParser();
+ obj = parser.parse(response);
+ jsonObject = (JSONObject) obj;
+ userUuid = (String)jsonObject.get("uuid");
+ params = new HashMap<String, Object>();
+ params.put("uuid", userUuid);
+ response = arv.call("users", "delete", params);
+
// Make a pipeline_templates.list call
System.out.println("Making a pipeline_templates.list call.");
- params = new ArrayList<String>();
- params.add("call");
- params.add("arvados");
- params.add("v1");
- params.add("pipeline_templates.list");
- response = arv.call(params);
+ params = new HashMap<String, Object>();
+ response = arv.call("pipeline_templates", "list", params);
System.out.println("Arvados pipelinetempates.list:\n" + response);
}
diff --git a/sdk/java/README b/sdk/java/README
index 423cf97..1cdc052 100644
--- a/sdk/java/README
+++ b/sdk/java/README
@@ -84,24 +84,24 @@
== Implementing your code to use SDK
- - <ARVADOS_HOME>/sdk/java/ArvadosSDKJavaUser.java serves as an example
+ - <ARVADOS_HOME>/sdk/java/ArvadosSDKJavaExample.java serves as an example
implementation using the java SDK. Please use this file to see how
you would want use the SDK from your java program.
The steps below use this java class name.
- - ArvadosSDKJavaUser.java creates an instance of Arvados SDK class and
+ - ArvadosSDKJavaExample.java creates an instance of Arvados SDK class and
uses it to make various "call" requests.
- - To compile ArvadosSDKJavaUser.java
+ - To compile ArvadosSDKJavaExample.java
- javac -cp <ARVADOS_HOME>/sdk/java/target/java-1.0-SNAPSHOT-jar-with-dependencies.jar ArvadosSDKJavaUser.java
+ javac -cp <ARVADOS_HOME>/sdk/java/target/java-1.0-SNAPSHOT-jar-with-dependencies.jar ArvadosSDKJavaExample.java
- This results in the generation of the ArvadosSDKJavaUser.class file
+ This results in the generation of the ArvadosSDKJavaExample.class file
in the same dir as the java file
- To run the class file
- java -cp .:<ARVADOS_HOME>/sdk/java/target/java-1.0-SNAPSHOT-jar-with-dependencies.jar ArvadosSDKJavaUser
+ java -cp .:<ARVADOS_HOME>/sdk/java/target/java-1.0-SNAPSHOT-jar-with-dependencies.jar ArvadosSDKJavaExample
== Viewing and managing SDK logging
diff --git a/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java b/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
index 06839ef..c2b8c18 100644
--- a/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
+++ b/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
@@ -362,5 +362,9 @@ public class Arvados {
logger.debug(errorDetail);
throw new Exception(errorDetail);
}
-
+
+ public static void main(String[] args){
+ System.out.println("Welcome to Arvados Java SDK.");
+ System.out.println("Please refer to README to learn to use the SDK.");
+ }
}
\ No newline at end of file
commit 752bd0d292c7fd6eb55b39cdc9d7373c7f35e0ec
Author: radhika <radhika at curoverse.com>
Date: Sat May 3 16:27:19 2014 -0400
2525: delete object created during test.
diff --git a/sdk/java/src/test/java/org/arvados/sdk/java/ArvadosTest.java b/sdk/java/src/test/java/org/arvados/sdk/java/ArvadosTest.java
index 9931d18..084b6d1 100644
--- a/sdk/java/src/test/java/org/arvados/sdk/java/ArvadosTest.java
+++ b/sdk/java/src/test/java/org/arvados/sdk/java/ArvadosTest.java
@@ -125,7 +125,28 @@ public class ArvadosTest {
JSONParser parser = new JSONParser();
JSONObject jsonObject = (JSONObject) parser.parse(response);
assertEquals("Expected kind to be user", "arvados#user", jsonObject.get("kind"));
- assertNotNull("Expected uuid for first user", jsonObject.get("uuid"));
+
+ Object uuid = jsonObject.get("uuid");
+ assertNotNull("Expected uuid for first user", uuid);
+
+ // delete the object
+ params = new HashMap<String, Object>();
+ params.put("uuid", uuid);
+ response = arv.call("users", "delete", params);
+
+ // invoke users.get with the system user uuid
+ params = new HashMap<String, Object>();
+ params.put("uuid", uuid);
+
+ Exception caught = null;
+ try {
+ arv.call("users", "get", params);
+ } catch (Exception e) {
+ caught = e;
+ }
+
+ assertNotNull ("expected exception", caught);
+ assertTrue ("Expected 404", caught.getMessage().contains("Path not found"));
}
@Test
@@ -177,6 +198,11 @@ public class ArvadosTest {
uuid = jsonObject.get("uuid");
assertNotNull("Expected uuid for first user", uuid);
+
+ // delete the object
+ params = new HashMap<String, Object>();
+ params.put("uuid", uuid);
+ response = arv.call("users", "delete", params);
}
/**
@@ -285,6 +311,11 @@ public class ArvadosTest {
jsonObject = (JSONObject) parser.parse(response);
assertEquals("Expected kind to be user", "arvados#pipelineTemplate", jsonObject.get("kind"));
assertEquals("Expected uuid for pipeline template", uuid, jsonObject.get("uuid"));
+
+ // delete the object
+ params = new HashMap<String, Object>();
+ params.put("uuid", uuid);
+ response = arv.call("pipeline_templates", "delete", params);
}
/**
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list