[ARVADOS] updated: 2.1.0-1728-g06adeb3ba
Git user
git at public.arvados.org
Wed Dec 15 19:27:05 UTC 2021
Summary of changes:
sdk/java/.classpath | 21 -
sdk/java/.project | 14 -
sdk/java/.settings/org.eclipse.jdt.core.prefs | 5 -
sdk/java/ArvadosSDKJavaExample.java | 84 ----
sdk/java/ArvadosSDKJavaExampleWithPrompt.java | 127 ------
sdk/java/README | 4 -
sdk/java/pom.xml | 106 -----
.../src/main/java/org/arvados/sdk/Arvados.java | 465 --------------------
.../main/java/org/arvados/sdk/MethodDetails.java | 26 --
sdk/java/src/main/resources/log4j.properties | 11 -
.../java/org/arvados/sdk/java/ArvadosTest.java | 467 ---------------------
sdk/java/src/test/resources/first_pipeline.json | 15 -
12 files changed, 1345 deletions(-)
delete mode 100644 sdk/java/.classpath
delete mode 100644 sdk/java/.project
delete mode 100644 sdk/java/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 sdk/java/ArvadosSDKJavaExample.java
delete mode 100644 sdk/java/ArvadosSDKJavaExampleWithPrompt.java
delete mode 100644 sdk/java/README
delete mode 100644 sdk/java/pom.xml
delete mode 100644 sdk/java/src/main/java/org/arvados/sdk/Arvados.java
delete mode 100644 sdk/java/src/main/java/org/arvados/sdk/MethodDetails.java
delete mode 100644 sdk/java/src/main/resources/log4j.properties
delete mode 100644 sdk/java/src/test/java/org/arvados/sdk/java/ArvadosTest.java
delete mode 100644 sdk/java/src/test/resources/first_pipeline.json
via 06adeb3ba56a3a7d62c3e598ad1bec0f3a03f1cb (commit)
from 49a8f11dc32bf1d7d5282d5bdb0b66493df90277 (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 06adeb3ba56a3a7d62c3e598ad1bec0f3a03f1cb
Author: Ward Vandewege <ward at curii.com>
Date: Wed Dec 15 14:26:40 2021 -0500
18585: actually remove the old Java SDK.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/sdk/java/.classpath b/sdk/java/.classpath
deleted file mode 100644
index 27d14a11c..000000000
--- a/sdk/java/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/google/apis/google-api-services-discovery/v1-rev42-1.18.0-rc/google-api-services-discovery-v1-rev42-1.18.0-rc.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/api-client/google-api-client/1.18.0-rc/google-api-client-1.18.0-rc.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/http-client/google-http-client/1.18.0-rc/google-http-client-1.18.0-rc.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/http-client/google-http-client-jackson2/1.18.0-rc/google-http-client-jackson2-1.18.0-rc.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.1.3/jackson-core-2.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/r05/guava-r05.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/sdk/java/.project b/sdk/java/.project
deleted file mode 100644
index 40c2bdf1b..000000000
--- a/sdk/java/.project
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>java</name>
- <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/sdk/java/.settings/org.eclipse.jdt.core.prefs b/sdk/java/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f4f19ea0e..000000000
--- a/sdk/java/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Apr 28 10:33:40 EDT 2014
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
diff --git a/sdk/java/ArvadosSDKJavaExample.java b/sdk/java/ArvadosSDKJavaExample.java
deleted file mode 100644
index ded6ce99d..000000000
--- a/sdk/java/ArvadosSDKJavaExample.java
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * This Sample test program is useful in getting started with working with Arvados Java SDK.
- * @author radhika
- *
- */
-
-import org.arvados.sdk.Arvados;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-public class ArvadosSDKJavaExample {
- /** Make sure the following environment variables are set before using Arvados:
- * ARVADOS_API_TOKEN, ARVADOS_API_HOST and ARVADOS_API_HOST_INSECURE
- * Set ARVADOS_API_HOST_INSECURE to true if you are using self-singed
- * certificates in development and want to bypass certificate validations.
- *
- * If you are not using env variables, you can pass them to Arvados constructor.
- *
- * Please refer to http://doc.arvados.org/api/index.html for a complete list
- * of the available API methods.
- */
- public static void main(String[] args) throws Exception {
- String apiName = "arvados";
- String apiVersion = "v1";
-
- Arvados arv = new Arvados(apiName, apiVersion);
-
- // Make a users list call. Here list on users is the method being invoked.
- // Expect a Map containing the list of users as the response.
- System.out.println("Making an arvados users.list api call");
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map response = arv.call("users", "list", params);
- System.out.println("Arvados users.list:\n");
- printResponse(response);
-
- // get uuid of the first user from the response
- List items = (List)response.get("items");
-
- Map firstUser = (Map)items.get(0);
- String userUuid = (String)firstUser.get("uuid");
-
- // Make a users get call on the uuid obtained above
- System.out.println("\n\n\nMaking 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");
- printResponse(response);
-
- // Make a pipeline_templates list call
- System.out.println("\n\n\nMaking a pipeline_templates.list call.");
-
- params = new HashMap<String, Object>();
- response = arv.call("pipeline_templates", "list", params);
-
- System.out.println("Arvados pipelinetempates.list:\n");
- printResponse(response);
- }
-
- private static void printResponse(Map response){
- Set<Entry<String,Object>> entrySet = (Set<Entry<String,Object>>)response.entrySet();
- for (Map.Entry<String, Object> entry : entrySet) {
- if ("items".equals(entry.getKey())) {
- List items = (List)entry.getValue();
- for (Object item : items) {
- System.out.println(" " + item);
- }
- } else {
- System.out.println(entry.getKey() + " = " + entry.getValue());
- }
- }
- }
-}
diff --git a/sdk/java/ArvadosSDKJavaExampleWithPrompt.java b/sdk/java/ArvadosSDKJavaExampleWithPrompt.java
deleted file mode 100644
index d9608ed7c..000000000
--- a/sdk/java/ArvadosSDKJavaExampleWithPrompt.java
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-/**
- * This Sample test program is useful in getting started with using Arvados Java SDK.
- * This program creates an Arvados instance using the configured environment variables.
- * It then provides a prompt to input method name and input parameters.
- * The program them invokes the API server to execute the specified method.
- *
- * @author radhika
- */
-
-import org.arvados.sdk.Arvados;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-public class ArvadosSDKJavaExampleWithPrompt {
- /**
- * Make sure the following environment variables are set before using Arvados:
- * ARVADOS_API_TOKEN, ARVADOS_API_HOST and ARVADOS_API_HOST_INSECURE Set
- * ARVADOS_API_HOST_INSECURE to true if you are using self-singed certificates
- * in development and want to bypass certificate validations.
- *
- * Please refer to http://doc.arvados.org/api/index.html for a complete list
- * of the available API methods.
- */
- public static void main(String[] args) throws Exception {
- String apiName = "arvados";
- String apiVersion = "v1";
-
- System.out.print("Welcome to Arvados Java SDK.");
- System.out.println("\nYou can use this example to call API methods interactively.");
- System.out.println("\nPlease refer to http://doc.arvados.org/api/index.html for api documentation");
- System.out.println("\nTo make the calls, enter input data at the prompt.");
- System.out.println("When entering parameters, you may enter a simple string or a well-formed json.");
- System.out.println("For example to get a user you may enter: user, zzzzz-12345-67890");
- System.out.println("Or to filter links, you may enter: filters, [[ \"name\", \"=\", \"can_manage\"]]");
-
- System.out.println("\nEnter ^C when you want to quit");
-
- // use configured env variables for API TOKEN, HOST and HOST_INSECURE
- Arvados arv = new Arvados(apiName, apiVersion);
-
- while (true) {
- try {
- // prompt for resource
- System.out.println("\n\nEnter Resource name (for example users)");
- System.out.println("\nAvailable resources are: " + arv.getAvailableResourses());
- System.out.print("\n>>> ");
-
- // read resource name
- BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
- String resourceName = in.readLine().trim();
- if ("".equals(resourceName)) {
- throw (new Exception("No resource name entered"));
- }
- // read method name
- System.out.println("\nEnter method name (for example get)");
- System.out.println("\nAvailable methods are: " + arv.getAvailableMethodsForResourse(resourceName));
- System.out.print("\n>>> ");
- String methodName = in.readLine().trim();
- if ("".equals(methodName)) {
- throw (new Exception("No method name entered"));
- }
-
- // read method parameters
- System.out.println("\nEnter parameter name, value (for example uuid, uuid-value)");
- System.out.println("\nAvailable parameters are: " +
- arv.getAvailableParametersForMethod(resourceName, methodName));
-
- System.out.print("\n>>> ");
- Map paramsMap = new HashMap();
- String param = "";
- try {
- do {
- param = in.readLine();
- if (param.isEmpty())
- break;
- int index = param.indexOf(","); // first comma
- String paramName = param.substring(0, index);
- String paramValue = param.substring(index+1);
- paramsMap.put(paramName.trim(), paramValue.trim());
-
- System.out.println("\nEnter parameter name, value (for example uuid, uuid-value)");
- System.out.print("\n>>> ");
- } while (!param.isEmpty());
- } catch (Exception e) {
- System.out.println (e.getMessage());
- System.out.println ("\nSet up a new call");
- continue;
- }
-
- // Make a "call" for the given resource name and method name
- try {
- System.out.println ("Making a call for " + resourceName + " " + methodName);
- Map response = arv.call(resourceName, methodName, paramsMap);
-
- Set<Entry<String,Object>> entrySet = (Set<Entry<String,Object>>)response.entrySet();
- for (Map.Entry<String, Object> entry : entrySet) {
- if ("items".equals(entry.getKey())) {
- List items = (List)entry.getValue();
- for (Object item : items) {
- System.out.println(" " + item);
- }
- } else {
- System.out.println(entry.getKey() + " = " + entry.getValue());
- }
- }
- } catch (Exception e){
- System.out.println (e.getMessage());
- System.out.println ("\nSet up a new call");
- }
- } catch (Exception e) {
- System.out.println (e.getMessage());
- System.out.println ("\nSet up a new call");
- }
- }
- }
-}
diff --git a/sdk/java/README b/sdk/java/README
deleted file mode 100644
index 0933b8819..000000000
--- a/sdk/java/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Welcome to Arvados Java SDK.
-
-Please refer to http://doc.arvados.org/sdk/java/index.html to get started
- with Arvados Java SDK.
diff --git a/sdk/java/pom.xml b/sdk/java/pom.xml
deleted file mode 100644
index 13e1c6a48..000000000
--- a/sdk/java/pom.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.arvados.sdk</groupId>
- <artifactId>arvados</artifactId>
- <packaging>jar</packaging>
- <version>1.1</version>
- <name>arvados-sdk</name>
- <url>http://arvados.org</url>
-
- <dependencies>
- <dependency>
- <groupId>com.google.apis</groupId>
- <artifactId>google-api-services-discovery</artifactId>
- <version>v1-rev42-1.18.0-rc</version>
- </dependency>
- <dependency>
- <groupId>com.google.api-client</groupId>
- <artifactId>google-api-client</artifactId>
- <version>1.18.0-rc</version>
- </dependency>
- <dependency>
- <groupId>com.google.http-client</groupId>
- <artifactId>google-http-client-jackson2</artifactId>
- <version>1.18.0-rc</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r05</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>arvados-sdk-1.1</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>attached</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <archive>
- <manifest>
- <mainClass>org.arvados.sdk.Arvados</mainClass>
- </manifest>
- <manifestEntries>
- <!--<Premain-Class>Your.agent.class</Premain-Class> <Agent-Class>Your.agent.class</Agent-Class> -->
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- <Can-Retransform-Classes>true</Can-Retransform-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <targetPath>${basedir}/target/classes</targetPath>
- <includes>
- <include>log4j.properties</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-</project>
diff --git a/sdk/java/src/main/java/org/arvados/sdk/Arvados.java b/sdk/java/src/main/java/org/arvados/sdk/Arvados.java
deleted file mode 100644
index 102c2a3c2..000000000
--- a/sdk/java/src/main/java/org/arvados/sdk/Arvados.java
+++ /dev/null
@@ -1,465 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.arvados.sdk;
-
-import com.google.api.client.http.javanet.*;
-import com.google.api.client.http.ByteArrayContent;
-import com.google.api.client.http.GenericUrl;
-import com.google.api.client.http.HttpBackOffIOExceptionHandler;
-import com.google.api.client.http.HttpContent;
-import com.google.api.client.http.HttpRequest;
-import com.google.api.client.http.HttpRequestFactory;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.UriTemplate;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.client.util.ExponentialBackOff;
-import com.google.api.client.util.Maps;
-import com.google.api.services.discovery.Discovery;
-import com.google.api.services.discovery.model.JsonSchema;
-import com.google.api.services.discovery.model.RestDescription;
-import com.google.api.services.discovery.model.RestMethod;
-import com.google.api.services.discovery.model.RestMethod.Request;
-import com.google.api.services.discovery.model.RestResource;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-/**
- * This class provides a java SDK interface to Arvados API server.
- *
- * Please refer to http://doc.arvados.org/api/ to learn about the
- * various resources and methods exposed by the API server.
- *
- * @author radhika
- */
-public class Arvados {
- // HttpTransport and JsonFactory are thread-safe. So, use global instances.
- private HttpTransport httpTransport;
- private final JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
-
- private String arvadosApiToken;
- private String arvadosApiHost;
- private boolean arvadosApiHostInsecure;
-
- private String arvadosRootUrl;
-
- private static final Logger logger = Logger.getLogger(Arvados.class);
-
- // Get it once and reuse on the call requests
- RestDescription restDescription = null;
- String apiName = null;
- String apiVersion = null;
-
- public Arvados (String apiName, String apiVersion) throws Exception {
- this (apiName, apiVersion, null, null, null);
- }
-
- public Arvados (String apiName, String apiVersion, String token,
- String host, String hostInsecure) throws Exception {
- this.apiName = apiName;
- this.apiVersion = apiVersion;
-
- // Read needed environmental variables if they are not passed
- if (token != null) {
- arvadosApiToken = token;
- } else {
- arvadosApiToken = System.getenv().get("ARVADOS_API_TOKEN");
- if (arvadosApiToken == null) {
- throw new Exception("Missing environment variable: ARVADOS_API_TOKEN");
- }
- }
-
- if (host != null) {
- arvadosApiHost = host;
- } else {
- arvadosApiHost = System.getenv().get("ARVADOS_API_HOST");
- if (arvadosApiHost == null) {
- throw new Exception("Missing environment variable: ARVADOS_API_HOST");
- }
- }
- arvadosRootUrl = "https://" + arvadosApiHost;
-
- if (hostInsecure != null) {
- arvadosApiHostInsecure = Boolean.valueOf(hostInsecure);
- } else {
- arvadosApiHostInsecure =
- "true".equals(System.getenv().get("ARVADOS_API_HOST_INSECURE")) ? true : false;
- }
-
- // Create HTTP_TRANSPORT object
- NetHttpTransport.Builder builder = new NetHttpTransport.Builder();
- if (arvadosApiHostInsecure) {
- builder.doNotValidateCertificate();
- }
- httpTransport = builder.build();
-
- // initialize rest description
- restDescription = loadArvadosApi();
- }
-
- /**
- * Make a call to API server with the provide call information.
- * @param resourceName
- * @param methodName
- * @param paramsMap
- * @return Map
- * @throws Exception
- */
- public Map call(String resourceName, String methodName,
- Map<String, Object> paramsMap) throws Exception {
- RestMethod method = getMatchingMethod(resourceName, methodName);
-
- HashMap<String, Object> parameters = loadParameters(paramsMap, method);
-
- GenericUrl url = new GenericUrl(UriTemplate.expand(
- arvadosRootUrl + restDescription.getBasePath() + method.getPath(),
- parameters, true));
-
- try {
- // construct the request
- HttpRequestFactory requestFactory;
- requestFactory = httpTransport.createRequestFactory();
-
- // possibly required content
- HttpContent content = null;
-
- if (!method.getHttpMethod().equals("GET") &&
- !method.getHttpMethod().equals("DELETE")) {
- String objectName = resourceName.substring(0, resourceName.length()-1);
- Object requestBody = paramsMap.get(objectName);
- if (requestBody == null) {
- error("POST method requires content object " + objectName);
- }
-
- content = new ByteArrayContent("application/json",((String)requestBody).getBytes());
- }
-
- HttpRequest request =
- requestFactory.buildRequest(method.getHttpMethod(), url, content);
-
- // Set read timeout to 120 seconds (up from default of 20 seconds)
- request.setReadTimeout(120 * 1000);
-
- // Add retry behavior
- request.setIOExceptionHandler(new HttpBackOffIOExceptionHandler(new ExponentialBackOff()));
-
- // make the request
- List<String> authHeader = new ArrayList<String>();
- authHeader.add("OAuth2 " + arvadosApiToken);
- request.getHeaders().put("Authorization", authHeader);
- String response = request.execute().parseAsString();
-
- Map responseMap = jsonFactory.createJsonParser(response).parse(HashMap.class);
-
- logger.debug(responseMap);
-
- return responseMap;
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- }
- }
-
- /**
- * Get all supported resources by the API
- * @return Set
- */
- public Set<String> getAvailableResourses() {
- return (restDescription.getResources().keySet());
- }
-
- /**
- * Get all supported method names for the given resource
- * @param resourceName
- * @return Set
- * @throws Exception
- */
- public Set<String> getAvailableMethodsForResourse(String resourceName)
- throws Exception {
- Map<String, RestMethod> methodMap = getMatchingMethodMap (resourceName);
- return (methodMap.keySet());
- }
-
- /**
- * Get the parameters for the method in the resource sought.
- * @param resourceName
- * @param methodName
- * @return Set
- * @throws Exception
- */
- public Map<String,List<String>> getAvailableParametersForMethod(String resourceName, String methodName)
- throws Exception {
- RestMethod method = getMatchingMethod(resourceName, methodName);
- Map<String, List<String>> parameters = new HashMap<String, List<String>>();
- List<String> requiredParameters = new ArrayList<String>();
- List<String> optionalParameters = new ArrayList<String>();
- parameters.put ("required", requiredParameters);
- parameters.put("optional", optionalParameters);
-
- try {
- // get any request parameters
- Request request = method.getRequest();
- if (request != null) {
- Object required = request.get("required");
- Object requestProperties = request.get("properties");
- if (requestProperties != null) {
- if (requestProperties instanceof Map) {
- Map properties = (Map)requestProperties;
- Set<String> propertyKeys = properties.keySet();
- for (String property : propertyKeys) {
- if (Boolean.TRUE.equals(required)) {
- requiredParameters.add(property);
- } else {
- optionalParameters.add(property);
- }
- }
- }
- }
- }
-
- // get other listed parameters
- Map<String,JsonSchema> methodParameters = method.getParameters();
- for (Map.Entry<String, JsonSchema> entry : methodParameters.entrySet()) {
- if (Boolean.TRUE.equals(entry.getValue().getRequired())) {
- requiredParameters.add(entry.getKey());
- } else {
- optionalParameters.add(entry.getKey());
- }
- }
- } catch (Exception e){
- logger.error(e);
- }
-
- return parameters;
- }
-
- private HashMap<String, Object> loadParameters(Map<String, Object> paramsMap,
- RestMethod method) throws Exception {
- HashMap<String, Object> parameters = Maps.newHashMap();
-
- // required parameters
- if (method.getParameterOrder() != null) {
- for (String parameterName : method.getParameterOrder()) {
- JsonSchema parameter = method.getParameters().get(parameterName);
- if (Boolean.TRUE.equals(parameter.getRequired())) {
- Object parameterValue = paramsMap.get(parameterName);
- if (parameterValue == null) {
- error("missing required parameter: " + parameter);
- } else {
- putParameter(null, parameters, parameterName, parameter, parameterValue);
- }
- }
- }
- }
-
- for (Map.Entry<String, Object> entry : paramsMap.entrySet()) {
- String parameterName = entry.getKey();
- Object parameterValue = entry.getValue();
-
- if (parameterName.equals("contentType")) {
- if (method.getHttpMethod().equals("GET") || method.getHttpMethod().equals("DELETE")) {
- error("HTTP content type cannot be specified for this method: " + parameterName);
- }
- } else {
- JsonSchema parameter = null;
- if (restDescription.getParameters() != null) {
- parameter = restDescription.getParameters().get(parameterName);
- }
- if (parameter == null && method.getParameters() != null) {
- parameter = method.getParameters().get(parameterName);
- }
- putParameter(parameterName, parameters, parameterName, parameter, parameterValue);
- }
- }
-
- return parameters;
- }
-
- private RestMethod getMatchingMethod(String resourceName, String methodName)
- throws Exception {
- Map<String, RestMethod> methodMap = getMatchingMethodMap(resourceName);
-
- if (methodName == null) {
- error("missing method name");
- }
-
- RestMethod method =
- methodMap == null ? null : methodMap.get(methodName);
- if (method == null) {
- error("method not found: ");
- }
-
- return method;
- }
-
- private Map<String, RestMethod> getMatchingMethodMap(String resourceName)
- throws Exception {
- if (resourceName == null) {
- error("missing resource name");
- }
-
- Map<String, RestMethod> methodMap = null;
- Map<String, RestResource> resources = restDescription.getResources();
- RestResource resource = resources.get(resourceName);
- if (resource == null) {
- error("resource not found");
- }
- methodMap = resource.getMethods();
- return methodMap;
- }
-
- /**
- * Not thread-safe. So, create for each request.
- * @param apiName
- * @param apiVersion
- * @return
- * @throws Exception
- */
- private RestDescription loadArvadosApi()
- throws Exception {
- try {
- Discovery discovery;
-
- Discovery.Builder discoveryBuilder =
- new Discovery.Builder(httpTransport, jsonFactory, null);
-
- discoveryBuilder.setRootUrl(arvadosRootUrl);
- discoveryBuilder.setApplicationName(apiName);
-
- discovery = discoveryBuilder.build();
-
- return discovery.apis().getRest(apiName, apiVersion).execute();
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- }
- }
-
- /**
- * Convert the input parameter into its equivalent json string.
- * Add this json string value to the parameters map to be sent to server.
- * @param argName
- * @param parameters
- * @param parameterName
- * @param parameter
- * @param parameterValue
- * @throws Exception
- */
- private void putParameter(String argName, Map<String, Object> parameters,
- String parameterName, JsonSchema parameter, Object parameterValue)
- throws Exception {
- Object value = parameterValue;
- if (parameter != null) {
- if ("boolean".equals(parameter.getType())) {
- value = Boolean.valueOf(parameterValue.toString());
- } else if ("number".equals(parameter.getType())) {
- value = new BigDecimal(parameterValue.toString());
- } else if ("integer".equals(parameter.getType())) {
- value = new BigInteger(parameterValue.toString());
- } else if ("float".equals(parameter.getType())) {
- value = new BigDecimal(parameterValue.toString());
- } else if ("Java.util.Calendar".equals(parameter.getType())) {
- value = new BigDecimal(parameterValue.toString());
- } else if (("array".equals(parameter.getType())) ||
- ("Array".equals(parameter.getType()))) {
- if (parameterValue.getClass().isArray()){
- value = getJsonValueFromArrayType(parameterValue);
- } else if (List.class.isAssignableFrom(parameterValue.getClass())) {
- value = getJsonValueFromListType(parameterValue);
- }
- } else if (("Hash".equals(parameter.getType())) ||
- ("hash".equals(parameter.getType()))) {
- value = getJsonValueFromMapType(parameterValue);
- } else {
- if (parameterValue.getClass().isArray()){
- value = getJsonValueFromArrayType(parameterValue);
- } else if (List.class.isAssignableFrom(parameterValue.getClass())) {
- value = getJsonValueFromListType(parameterValue);
- } else if (Map.class.isAssignableFrom(parameterValue.getClass())) {
- value = getJsonValueFromMapType(parameterValue);
- }
- }
- }
-
- parameters.put(parameterName, value);
- }
-
- /**
- * Convert the given input array into json string before sending to server.
- * @param parameterValue
- * @return
- */
- private String getJsonValueFromArrayType (Object parameterValue) {
- String arrayStr = Arrays.deepToString((Object[])parameterValue);
-
- // we can expect either an array of array objects or an array of objects
- if (arrayStr.startsWith("[[") && arrayStr.endsWith("]]")) {
- Object[][] array = new Object[1][];
- arrayStr = arrayStr.substring(2, arrayStr.length()-2);
- String jsonStr = getJsonStringForArrayStr(arrayStr);
- String value = "[" + jsonStr + "]";
- return value;
- } else {
- arrayStr = arrayStr.substring(1, arrayStr.length()-1);
- return (getJsonStringForArrayStr(arrayStr));
- }
- }
-
- private String getJsonStringForArrayStr(String arrayStr) {
- Object[] array = arrayStr.split(",");
- Object[] trimmedArray = new Object[array.length];
- for (int i=0; i<array.length; i++){
- trimmedArray[i] = array[i].toString().trim();
- }
- String value = JSONArray.toJSONString(Arrays.asList(trimmedArray));
- return value;
- }
-
- /**
- * Convert the given input List into json string before sending to server.
- * @param parameterValue
- * @return
- */
- private String getJsonValueFromListType (Object parameterValue) {
- List paramList = (List)parameterValue;
- Object[] array = new Object[paramList.size()];
- Arrays.deepToString(paramList.toArray(array));
- return (getJsonValueFromArrayType(array));
- }
-
- /**
- * Convert the given input map into json string before sending to server.
- * @param parameterValue
- * @return
- */
- private String getJsonValueFromMapType (Object parameterValue) {
- JSONObject json = new JSONObject((Map)parameterValue);
- return json.toString();
- }
-
- private static void error(String detail) throws Exception {
- String errorDetail = "ERROR: " + detail;
-
- 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 http://doc.arvados.org/sdk/java/index.html to get started with the SDK.");
- }
-
-}
diff --git a/sdk/java/src/main/java/org/arvados/sdk/MethodDetails.java b/sdk/java/src/main/java/org/arvados/sdk/MethodDetails.java
deleted file mode 100644
index fccc100b5..000000000
--- a/sdk/java/src/main/java/org/arvados/sdk/MethodDetails.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.arvados.sdk;
-
-import com.google.api.client.util.Lists;
-import com.google.api.client.util.Sets;
-
-import java.util.ArrayList;
-import java.util.SortedSet;
-
-public class MethodDetails implements Comparable<MethodDetails> {
- String name;
- ArrayList<String> requiredParameters = Lists.newArrayList();
- SortedSet<String> optionalParameters = Sets.newTreeSet();
- boolean hasContent;
-
- @Override
- public int compareTo(MethodDetails o) {
- if (o == this) {
- return 0;
- }
- return name.compareTo(o.name);
- }
-}
diff --git a/sdk/java/src/main/resources/log4j.properties b/sdk/java/src/main/resources/log4j.properties
deleted file mode 100644
index 89a9b93c0..000000000
--- a/sdk/java/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# To change log location, change log4j.appender.fileAppender.File
-
-log4j.rootLogger=DEBUG, fileAppender
-
-log4j.appender.fileAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.fileAppender.File=${basedir}/log/arvados_sdk_java.log
-log4j.appender.fileAppender.Append=true
-log4j.appender.file.MaxFileSize=10MB
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.fileAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.fileAppender.layout.ConversionPattern=[%d] %-5p %c %L %x - %m%n
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
deleted file mode 100644
index 9de894669..000000000
--- a/sdk/java/src/test/java/org/arvados/sdk/java/ArvadosTest.java
+++ /dev/null
@@ -1,467 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.arvados.sdk;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Unit test for Arvados.
- */
-public class ArvadosTest {
-
- /**
- * Test users.list api
- * @throws Exception
- */
- @Test
- public void testCallUsersList() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map response = arv.call("users", "list", params);
- assertEquals("Expected kind to be users.list", "arvados#userList", response.get("kind"));
-
- List items = (List)response.get("items");
- assertNotNull("expected users list items", items);
- assertTrue("expected at least one item in users list", items.size()>0);
-
- Map firstUser = (Map)items.get(0);
- assertNotNull ("Expcted at least one user", firstUser);
-
- assertEquals("Expected kind to be user", "arvados#user", firstUser.get("kind"));
- assertNotNull("Expected uuid for first user", firstUser.get("uuid"));
- }
-
- /**
- * Test users.get <uuid> api
- * @throws Exception
- */
- @Test
- public void testCallUsersGet() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- // call user.system and get uuid of this user
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map response = arv.call("users", "list", params);
-
- assertNotNull("expected users list", response);
- List items = (List)response.get("items");
- assertNotNull("expected users list items", items);
-
- Map firstUser = (Map)items.get(0);
- String userUuid = (String)firstUser.get("uuid");
-
- // invoke users.get with the system user uuid
- params = new HashMap<String, Object>();
- params.put("uuid", userUuid);
-
- response = arv.call("users", "get", params);
-
- assertNotNull("Expected uuid for first user", response.get("uuid"));
- assertEquals("Expected system user uuid", userUuid, response.get("uuid"));
- }
-
- /**
- * Test users.create api
- * @throws Exception
- */
- @Test
- public void testCreateUser() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
- params.put("user", "{}");
- Map response = arv.call("users", "create", params);
-
- assertEquals("Expected kind to be user", "arvados#user", response.get("kind"));
-
- Object uuid = response.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
- public void testCreateUserWithMissingRequiredParam() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Exception caught = null;
- try {
- arv.call("users", "create", params);
- } catch (Exception e) {
- caught = e;
- }
-
- assertNotNull ("expected exception", caught);
- assertTrue ("Expected POST method requires content object user",
- caught.getMessage().contains("ERROR: POST method requires content object user"));
- }
-
- /**
- * Test users.create api
- * @throws Exception
- */
- @Test
- public void testCreateAndUpdateUser() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
- params.put("user", "{}");
- Map response = arv.call("users", "create", params);
-
- assertEquals("Expected kind to be user", "arvados#user", response.get("kind"));
-
- Object uuid = response.get("uuid");
- assertNotNull("Expected uuid for first user", uuid);
-
- // update this user
- params = new HashMap<String, Object>();
- params.put("user", "{}");
- params.put("uuid", uuid);
- response = arv.call("users", "update", params);
-
- assertEquals("Expected kind to be user", "arvados#user", response.get("kind"));
-
- uuid = response.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);
- }
-
- /**
- * Test unsupported api version api
- * @throws Exception
- */
- @Test
- public void testUnsupportedApiName() throws Exception {
- Exception caught = null;
- try {
- Arvados arv = new Arvados("not_arvados", "v1");
- } catch (Exception e) {
- caught = e;
- }
-
- assertNotNull ("expected exception", caught);
- assertTrue ("Expected 404 when unsupported api is used", caught.getMessage().contains("404 Not Found"));
- }
-
- /**
- * Test unsupported api version api
- * @throws Exception
- */
- @Test
- public void testUnsupportedVersion() throws Exception {
- Exception caught = null;
- try {
- Arvados arv = new Arvados("arvados", "v2");
- } catch (Exception e) {
- caught = e;
- }
-
- assertNotNull ("expected exception", caught);
- assertTrue ("Expected 404 when unsupported version is used", caught.getMessage().contains("404 Not Found"));
- }
-
- /**
- * Test unsupported api version api
- * @throws Exception
- */
- @Test
- public void testCallForNoSuchResrouce() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Exception caught = null;
- try {
- arv.call("abcd", "list", null);
- } catch (Exception e) {
- caught = e;
- }
-
- assertNotNull ("expected exception", caught);
- assertTrue ("Expected ERROR: 404 not found", caught.getMessage().contains("ERROR: resource not found"));
- }
-
- /**
- * Test unsupported api version api
- * @throws Exception
- */
- @Test
- public void testCallForNoSuchResrouceMethod() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Exception caught = null;
- try {
- arv.call("users", "abcd", null);
- } catch (Exception e) {
- caught = e;
- }
-
- assertNotNull ("expected exception", caught);
- assertTrue ("Expected ERROR: 404 not found", caught.getMessage().contains("ERROR: method not found"));
- }
-
- /**
- * Test pipeline_tempates.create api
- * @throws Exception
- */
- @Test
- public void testCreateAndGetPipelineTemplate() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- File file = new File(getClass().getResource( "/first_pipeline.json" ).toURI());
- byte[] data = new byte[(int)file.length()];
- try {
- FileInputStream is = new FileInputStream(file);
- is.read(data);
- is.close();
- }catch(Exception e) {
- e.printStackTrace();
- }
-
- Map<String, Object> params = new HashMap<String, Object>();
- params.put("pipeline_template", new String(data));
- Map response = arv.call("pipeline_templates", "create", params);
- assertEquals("Expected kind to be user", "arvados#pipelineTemplate", response.get("kind"));
- String uuid = (String)response.get("uuid");
- assertNotNull("Expected uuid for pipeline template", uuid);
-
- // get the pipeline
- params = new HashMap<String, Object>();
- params.put("uuid", uuid);
- response = arv.call("pipeline_templates", "get", params);
-
- assertEquals("Expected kind to be user", "arvados#pipelineTemplate", response.get("kind"));
- assertEquals("Expected uuid for pipeline template", uuid, response.get("uuid"));
-
- // delete the object
- params = new HashMap<String, Object>();
- params.put("uuid", uuid);
- response = arv.call("pipeline_templates", "delete", params);
- }
-
- /**
- * Test users.list api
- * @throws Exception
- */
- @Test
- public void testArvadosWithTokenPassed() throws Exception {
- String token = System.getenv().get("ARVADOS_API_TOKEN");
- String host = System.getenv().get("ARVADOS_API_HOST");
- String hostInsecure = System.getenv().get("ARVADOS_API_HOST_INSECURE");
-
- Arvados arv = new Arvados("arvados", "v1", token, host, hostInsecure);
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map response = arv.call("users", "list", params);
- assertEquals("Expected kind to be users.list", "arvados#userList", response.get("kind"));
- }
-
- /**
- * Test users.list api
- * @throws Exception
- */
- @Test
- public void testCallUsersListWithLimit() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map response = arv.call("users", "list", params);
- assertEquals("Expected users.list in response", "arvados#userList", response.get("kind"));
-
- List items = (List)response.get("items");
- assertNotNull("expected users list items", items);
- assertTrue("expected at least one item in users list", items.size()>0);
-
- int numUsersListItems = items.size();
-
- // make the request again with limit
- params = new HashMap<String, Object>();
- params.put("limit", numUsersListItems-1);
-
- response = arv.call("users", "list", params);
-
- assertEquals("Expected kind to be users.list", "arvados#userList", response.get("kind"));
-
- items = (List)response.get("items");
- assertNotNull("expected users list items", items);
- assertTrue("expected at least one item in users list", items.size()>0);
-
- int numUsersListItems2 = items.size();
- assertEquals ("Got more users than requested", numUsersListItems-1, numUsersListItems2);
- }
-
- @Test
- public void testGetLinksWithFilters() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map response = arv.call("links", "list", params);
- assertEquals("Expected links.list in response", "arvados#linkList", response.get("kind"));
-
- String[][] filters = new String[1][];
- String[] condition = new String[3];
- condition[0] = "name";
- condition[1] = "=";
- condition[2] = "can_manage";
- filters[0] = condition;
- params.put("filters", filters);
-
- response = arv.call("links", "list", params);
-
- assertEquals("Expected links.list in response", "arvados#linkList", response.get("kind"));
- assertFalse("Expected no can_manage in response", response.toString().contains("\"name\":\"can_manage\""));
- }
-
- @Test
- public void testGetLinksWithFiltersAsList() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map response = arv.call("links", "list", params);
- assertEquals("Expected links.list in response", "arvados#linkList", response.get("kind"));
-
- List<List> filters = new ArrayList<List>();
- List<String> condition = new ArrayList<String>();
- condition.add("name");
- condition.add("is_a");
- condition.add("can_manage");
- filters.add(condition);
- params.put("filters", filters);
-
- response = arv.call("links", "list", params);
-
- assertEquals("Expected links.list in response", "arvados#linkList", response.get("kind"));
- assertFalse("Expected no can_manage in response", response.toString().contains("\"name\":\"can_manage\""));
- }
-
- @Test
- public void testGetLinksWithTimestampFilters() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map response = arv.call("links", "list", params);
- assertEquals("Expected links.list in response", "arvados#linkList", response.get("kind"));
-
- // get links created "tomorrow". Expect none in response
- Calendar calendar = new GregorianCalendar();
- calendar.setTime(new Date());
- calendar.add(Calendar.DAY_OF_MONTH, 1);
-
- Object[][] filters = new Object[1][];
- Object[] condition = new Object[3];
- condition[0] = "created_at";
- condition[1] = ">";
- condition[2] = calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH)+1) + "-" + calendar.get(Calendar.DAY_OF_MONTH);
- filters[0] = condition;
- params.put("filters", filters);
-
- response = arv.call("links", "list", params);
-
- assertEquals("Expected links.list in response", "arvados#linkList", response.get("kind"));
- int items_avail = ((BigDecimal)response.get("items_available")).intValue();
- assertEquals("Expected zero links", items_avail, 0);
- }
-
- @Test
- public void testGetLinksWithWhereClause() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
-
- Map<String, Object> params = new HashMap<String, Object>();
-
- Map<String, String> where = new HashMap<String, String>();
- where.put("where", "updated_at > '2014-05-01'");
-
- params.put("where", where);
-
- Map response = arv.call("links", "list", params);
-
- assertEquals("Expected links.list in response", "arvados#linkList", response.get("kind"));
- }
-
- @Test
- public void testGetAvailableResources() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
- Set<String> resources = arv.getAvailableResourses();
- assertNotNull("Expected resources", resources);
- assertTrue("Excected users in resrouces", resources.contains("users"));
- }
-
- @Test
- public void testGetAvailableMethodsResources() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
- Set<String> methods = arv.getAvailableMethodsForResourse("users");
- assertNotNull("Expected resources", methods);
- assertTrue("Excected create method for users", methods.contains("create"));
- }
-
- @Test
- public void testGetAvailableParametersForUsersGetMethod() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
- Map<String,List<String>> parameters = arv.getAvailableParametersForMethod("users", "get");
- assertNotNull("Expected parameters", parameters);
- assertTrue("Excected uuid parameter for get method for users", parameters.get("required").contains("uuid"));
- }
-
- @Test
- public void testGetAvailableParametersForUsersCreateMethod() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
- Map<String,List<String>> parameters = arv.getAvailableParametersForMethod("users", "create");
- assertNotNull("Expected parameters", parameters);
- assertTrue("Excected user parameter for get method for users", parameters.get("required").contains("user"));
- }
-
- @Test
- public void testGetAvailableParametersForUsersListMethod() throws Exception {
- Arvados arv = new Arvados("arvados", "v1");
- Map<String,List<String>> parameters = arv.getAvailableParametersForMethod("users", "list");
- assertNotNull("Expected parameters", parameters);
- assertTrue("Excected no required parameter for list method for users", parameters.get("required").size() == 0);
- assertTrue("Excected some optional parameters for list method for users", parameters.get("optional").contains("filters"));
- }
-
-}
diff --git a/sdk/java/src/test/resources/first_pipeline.json b/sdk/java/src/test/resources/first_pipeline.json
deleted file mode 100644
index dc3b080e1..000000000
--- a/sdk/java/src/test/resources/first_pipeline.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "components":{
- "do_hash":{
- "script":"hash.py",
- "script_parameters":{
- "input":{
- "required": true,
- "dataclass": "Collection"
- }
- },
- "script_version":"master",
- "output_is_persistent":true
- }
- }
-}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list