You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2014/10/10 15:13:28 UTC
[02/50] [abbrv] Cleaned up ChefApi and ChefService interfaces
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
index 33d6a98..7cf9c40 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/ChefApiTest.java
@@ -83,7 +83,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of("0189e76ccc476701d6b374e5a1a27347", true)));
assertRequestLineEquals(httpRequest,
"PUT http://localhost:4000/sandboxes/0189e76ccc476701d6b374e5a1a27347 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"is_completed\":true}", "application/json", false);
@@ -95,14 +95,14 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
}
- public void testGetUploadSandboxForChecksums() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ChefApi.class, "getUploadSandboxForChecksums", Set.class);
+ public void testCreateUploadSandboxForChecksums() throws SecurityException, NoSuchMethodException, IOException {
+ Invokable<?, ?> method = method(ChefApi.class, "createUploadSandboxForChecksums", Set.class);
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList
.<Object> of(ImmutableSet.of(asList(base16().lowerCase().decode("0189e76ccc476701d6b374e5a1a27347")),
asList(base16().lowerCase().decode("0c5ecd7788cf4f6c7de2a57193897a6c")), asList(base16().lowerCase()
.decode("1dda05ed139664f1f89b9dec482b77c0"))))));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/sandboxes HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest,
"{\"checksums\":{\"0189e76ccc476701d6b374e5a1a27347\":null,\"0c5ecd7788cf4f6c7de2a57193897a6c\":null,"
@@ -120,7 +120,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method,
ImmutableList.<Object> of(URI.create("http://foo/bar"), new StringPayload("{\"foo\": \"bar\"}"))));
assertRequestLineEquals(httpRequest, "PUT http://foo/bar HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"foo\": \"bar\"}", "application/x-binary", false);
@@ -137,7 +137,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method,
ImmutableList.<Object> of("cookbook", "1.0.0")));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/cookbooks/cookbook/1.0.0 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -154,7 +154,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method,
ImmutableList.<Object> of("cookbook", "1.0.0")));
assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/cookbooks/cookbook/1.0.0 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -173,7 +173,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of("cookbook", "1.0.1", CookbookVersion.builder("cookbook", "1.0.1").build())));
assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/cookbooks/cookbook/1.0.1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest,
"{\"name\":\"cookbook-1.0.1\",\"definitions\":[],\"attributes\":[],\"files\":[],"
@@ -197,7 +197,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/cookbooks HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -209,13 +209,13 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
}
- public void testGetVersionsOfCookbook() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ChefApi.class, "getVersionsOfCookbook", String.class);
+ public void testListVersionsOfCookbook() throws SecurityException, NoSuchMethodException, IOException {
+ Invokable<?, ?> method = method(ChefApi.class, "listVersionsOfCookbook", String.class);
GeneratedHttpRequest httpRequest = processor
.apply(Invocation.create(method, ImmutableList.<Object> of("apache2")));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/cookbooks/apache2 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -232,7 +232,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor
.apply(Invocation.create(method, ImmutableList.<Object> of("client")));
assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/clients/client HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -249,7 +249,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.<Object> of("api")));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/clients HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"name\":\"api\"}", "application/json", false);
@@ -267,7 +267,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of("api", CreateClientOptions.Builder.admin())));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/clients HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"name\":\"api\",\"admin\":true}", "application/json", false);
@@ -284,7 +284,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/clients HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -301,7 +301,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor
.apply(Invocation.create(method, ImmutableList.<Object> of("client")));
assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/clients/client HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"name\":\"client\", \"private_key\": true}", "application/json", false);
@@ -317,7 +317,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
Invokable<?, ?> method = method(ChefApi.class, "deleteNode", String.class);
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.<Object> of("node")));
assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/nodes/node HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -337,7 +337,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
.environment("_default").build())));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/nodes HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest,
"{\"name\":\"testnode\",\"normal\":{},\"override\":{},\"default\":{},\"automatic\":{},"
@@ -360,7 +360,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
.environment("_default").build())));
assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/nodes/testnode HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest,
"{\"name\":\"testnode\",\"normal\":{},\"override\":{},\"default\":{},\"automatic\":{},"
@@ -380,7 +380,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/nodes HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -396,7 +396,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
Invokable<?, ?> method = method(ChefApi.class, "deleteRole", String.class);
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.<Object> of("role")));
assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/roles/role HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -414,7 +414,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of(Role.builder().name("testrole").runListElement("recipe[java]").build())));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/roles HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"name\":\"testrole\",\"override_attributes\":{},\"default_attributes\":{},"
+ "\"run_list\":[\"recipe[java]\"],\"json_class\":\"Chef::Role\",\"chef_type\":\"role\"}",
@@ -434,7 +434,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of(Role.builder().name("testrole").runListElement("recipe[java]").build())));
assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/roles/testrole HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"name\":\"testrole\",\"override_attributes\":{},\"default_attributes\":{},"
+ "\"run_list\":[\"recipe[java]\"],\"json_class\":\"Chef::Role\",\"chef_type\":\"role\"}",
@@ -453,7 +453,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/roles HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -470,7 +470,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor
.apply(Invocation.create(method, ImmutableList.<Object> of("databag")));
assertRequestLineEquals(httpRequest, "DELETE http://localhost:4000/data/databag HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -487,7 +487,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.<Object> of("name")));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/data HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"name\":\"name\"}", "application/json", false);
@@ -504,7 +504,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/data HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -520,7 +520,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
Invokable<?, ?> method = method(ChefApi.class, "deleteDatabagItem", String.class, String.class);
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method,
ImmutableList.<Object> of("name", "databagItem")));
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -540,7 +540,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of("name", new DatabagItem("id", "100"))));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/data/name HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(
httpRequest,
@@ -564,7 +564,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of("name", new DatabagItem("id", "{\"id\": \"item1\",\"my_key\": \"my_data\"}"))));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/data/name HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(
httpRequest,
@@ -586,7 +586,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of("name", new DatabagItem("id", "{\"id\": \"id\",\"my_key\": \"my_data\"}"))));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/data/name HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"id\": \"id\",\"my_key\": \"my_data\"}", "application/json", false);
@@ -604,7 +604,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of("name", new DatabagItem("id", "{\"my_key\": \"my_data\"}"))));
assertRequestLineEquals(httpRequest, "POST http://localhost:4000/data/name HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"id\":\"id\",\"my_key\": \"my_data\"}", "application/json", false);
@@ -622,7 +622,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of("name", new DatabagItem("id", "{\"my_key\": \"my_data\"}"))));
assertRequestLineEquals(httpRequest, "PUT http://localhost:4000/data/name/id HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"id\":\"id\",\"my_key\": \"my_data\"}", "application/json", false);
@@ -640,7 +640,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.<Object> of("name")));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/data/name HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -657,7 +657,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -674,7 +674,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search/role HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -692,7 +692,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of(SearchOptions.Builder.query("text"))));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search/role?q=text HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -709,7 +709,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search/client HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -727,7 +727,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of(SearchOptions.Builder.query("text").rows(5))));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search/client?q=text&rows=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -744,7 +744,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.of()));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search/node HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -762,7 +762,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of(SearchOptions.Builder.query("foo:foo").start(3))));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search/node?q=foo%3Afoo&start=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -774,12 +774,12 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
}
- public void testSearchDatabag() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ChefApi.class, "searchDatabag", String.class);
+ public void testSearchDatabagItems() throws SecurityException, NoSuchMethodException, IOException {
+ Invokable<?, ?> method = method(ChefApi.class, "searchDatabagItems", String.class);
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method, ImmutableList.<Object> of("foo")));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search/foo HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -791,13 +791,13 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
}
- public void testSearchDatabagWithOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ChefApi.class, "searchDatabag", String.class, SearchOptions.class);
+ public void testSearchDatabagItemsWithOptions() throws SecurityException, NoSuchMethodException, IOException {
+ Invokable<?, ?> method = method(ChefApi.class, "searchDatabagItems", String.class, SearchOptions.class);
GeneratedHttpRequest httpRequest = processor.apply(Invocation.create(method,
ImmutableList.<Object> of("foo", SearchOptions.Builder.query("bar").sort("name DESC"))));
assertRequestLineEquals(httpRequest, "GET http://localhost:4000/search/foo?q=bar&sort=name%20DESC HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -815,7 +815,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
ImmutableList.<Object> of(Resource.builder().name("test").url(URI.create("http://foo/bar")).build())));
assertRequestLineEquals(httpRequest, "GET http://foo/bar HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApi.VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -841,7 +841,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
@Override
protected Properties setupProperties() {
Properties props = super.setupProperties();
- props.put(Constants.PROPERTY_API_VERSION, ChefApi.VERSION + "-test");
+ props.put(Constants.PROPERTY_API_VERSION, ChefApiMetadata.DEFAULT_VERSION + "-test");
return props;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java b/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java
index 282e68e..c929dad 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/binders/BindHexEncodedMD5sToJsonPayloadTest.java
@@ -24,7 +24,7 @@ import java.io.File;
import javax.ws.rs.HttpMethod;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.http.HttpRequest;
import org.jclouds.json.config.GsonModule;
@@ -45,7 +45,7 @@ public class BindHexEncodedMD5sToJsonPayloadTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/GroupToBootScriptTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/GroupToBootScriptTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/GroupToBootScriptTest.java
index bbfb4bf..42b826a 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/GroupToBootScriptTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/GroupToBootScriptTest.java
@@ -28,7 +28,7 @@ import java.io.IOException;
import java.net.URI;
import java.security.PrivateKey;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefBootstrapModule;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.DatabagItem;
@@ -71,7 +71,7 @@ public class GroupToBootScriptTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
bind(String.class).annotatedWith(Names.named(CHEF_UPDATE_GEM_SYSTEM)).toInstance("true");
bind(String.class).annotatedWith(Names.named(CHEF_UPDATE_GEMS)).toInstance("true");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java
index 355d9a4..226697f 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java
@@ -24,7 +24,7 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.security.spec.InvalidKeySpecException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.Client;
import org.jclouds.crypto.Crypto;
@@ -66,7 +66,7 @@ public class ParseClientFromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonTest.java
index 9f97a1c..77c16f7 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.http.HttpResponse;
import org.jclouds.json.config.GsonModule;
@@ -48,7 +48,7 @@ public class ParseCookbookDefinitionFromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonv10Test.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonv10Test.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonv10Test.java
index 987e45a..9a47c1d 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonv10Test.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionFromJsonv10Test.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.CookbookDefinition;
import org.jclouds.http.HttpResponse;
@@ -45,7 +45,7 @@ public class ParseCookbookDefinitionFromJsonv10Test {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJsonv10Test.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJsonv10Test.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJsonv10Test.java
index d2cc882..51a3f6d 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJsonv10Test.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookDefinitionListFromJsonv10Test.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.CookbookDefinition;
import org.jclouds.http.HttpResponse;
@@ -46,7 +46,7 @@ public class ParseCookbookDefinitionListFromJsonv10Test {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java
index c1f21de..438d725 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionFromJsonTest.java
@@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.net.URI;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.CookbookVersion;
import org.jclouds.chef.domain.Metadata;
@@ -59,7 +59,7 @@ public class ParseCookbookVersionFromJsonTest {
injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJsonTest.java
index bd6552c..797e0a6 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJsonTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.http.HttpResponse;
import org.jclouds.json.config.GsonModule;
@@ -48,7 +48,7 @@ public class ParseCookbookVersionsV09FromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJsonTest.java
index ea781f8..a0d6670 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJsonTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.http.HttpResponse;
import org.jclouds.json.config.GsonModule;
@@ -48,7 +48,7 @@ public class ParseCookbookVersionsV10FromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java
index 14b342d..b8c3744 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseDataBagItemFromJsonTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.DatabagItem;
import org.jclouds.http.HttpResponse;
@@ -50,7 +50,7 @@ public class ParseDataBagItemFromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java
index cc0c942..31341e5 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseKeySetFromJsonTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.http.HttpResponse;
import org.jclouds.json.config.GsonModule;
@@ -48,7 +48,7 @@ public class ParseKeySetFromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java
index 5f825dd..57da4c4 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseNodeFromJsonTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.Node;
import org.jclouds.domain.JsonBall;
@@ -52,7 +52,7 @@ public class ParseNodeFromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java
index 13843ee..1a0d333 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSandboxFromJsonTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.Sandbox;
import org.jclouds.date.DateService;
@@ -53,7 +53,7 @@ public class ParseSandboxFromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSearchDataBagItemFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSearchDataBagItemFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSearchDataBagItemFromJsonTest.java
index 173fa0f..ae29e1c 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSearchDataBagItemFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseSearchDataBagItemFromJsonTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.DatabagItem;
import org.jclouds.chef.domain.SearchResult;
@@ -46,7 +46,7 @@ public class ParseSearchDataBagItemFromJsonTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java
index 03e61ca..a5d2bfb 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseUploadSandboxFromJsonTest.java
@@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.net.URI;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.ChecksumStatus;
import org.jclouds.chef.domain.UploadSandbox;
@@ -56,7 +56,7 @@ public class ParseUploadSandboxFromJsonTest {
injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForGroupTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForGroupTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForGroupTest.java
index 3bb2f99..8da3e79 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForGroupTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/functions/RunListForGroupTest.java
@@ -25,6 +25,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.domain.Client;
import org.jclouds.chef.domain.DatabagItem;
@@ -48,7 +49,7 @@ public class RunListForGroupTest {
private Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefApiLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefApiLiveTest.java
index 0cd9562..84cc092 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefApiLiveTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefApiLiveTest.java
@@ -77,7 +77,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
// It may take a bit until the search index is populated
protected int maxWaitForIndexInMs = 60000;
-
+
// The id of the data bag item used in search tests
private String databagitemId;
@@ -94,7 +94,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
List<Byte> md5 = Bytes.asList(content.getContentMetadata().getContentMD5());
// Request an upload site for this file
- UploadSandbox site = api.getUploadSandboxForChecksums(ImmutableSet.of(md5));
+ UploadSandbox site = api.createUploadSandboxForChecksums(ImmutableSet.of(md5));
assertTrue(site.getChecksums().containsKey(md5), md5 + " not in " + site.getChecksums());
try {
@@ -135,10 +135,10 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
assertFalse(cookbookNames.isEmpty(), "No cookbooks were found");
for (String cookbookName : cookbookNames) {
- Set<String> versions = api.getVersionsOfCookbook(cookbookName);
+ Set<String> versions = api.listVersionsOfCookbook(cookbookName);
assertFalse(versions.isEmpty(), "There are no versions of the cookbook: " + cookbookName);
- for (String version : api.getVersionsOfCookbook(cookbookName)) {
+ for (String version : api.listVersionsOfCookbook(cookbookName)) {
CookbookVersion cookbook = api.getCookbook(cookbookName, version);
assertNotNull(cookbook, "Could not get cookbook: " + cookbookName);
}
@@ -390,7 +390,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
@Test(dependsOnMethods = { "testListSearchIndexes", "testCreateDatabagItem" })
public void testSearchDatabag() throws Exception {
- SearchResult<? extends DatabagItem> results = api.searchDatabag(PREFIX);
+ SearchResult<? extends DatabagItem> results = api.searchDatabagItems(PREFIX);
assertNotNull(results, "Data bag item result list should not be null");
}
@@ -399,7 +399,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
Predicate<SearchOptions> waitForIndex = retry(new Predicate<SearchOptions>() {
@Override
public boolean apply(SearchOptions input) {
- SearchResult<? extends DatabagItem> results = api.searchDatabag(PREFIX, input);
+ SearchResult<? extends DatabagItem> results = api.searchDatabagItems(PREFIX, input);
assertNotNull(results);
if (results.size() > 0) {
assertEquals(results.size(), 1);
@@ -418,7 +418,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
@Test(expectedExceptions = ResourceNotFoundException.class, dependsOnMethods = "testListSearchIndexes")
public void testSearchDatabagNotFound() throws Exception {
- SearchResult<? extends DatabagItem> results = api.searchDatabag("whoopie");
+ SearchResult<? extends DatabagItem> results = api.searchDatabagItems("whoopie");
assertNotNull(results, "Data bag item result list should not be null");
}
@@ -469,7 +469,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
@Test(dependsOnMethods = "testCreateEnvironment")
public void testListEnvironmentRecipes() {
- Set<String> recipeList = api.listEnvironmentRecipes(PREFIX);
+ Set<String> recipeList = api.listRecipesInEnvironment(PREFIX);
assertTrue(!recipeList.isEmpty());
}
@@ -479,7 +479,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
api.createNode(Node.builder().name(ENV_NODE).runListElement("role[" + PREFIX + "]").environment(PREFIX).build());
Node node = api.getNode(ENV_NODE);
assertNotNull(node, "Created node should not be null");
- Set<String> nodeList = api.listEnvironmentNodes(PREFIX);
+ Set<String> nodeList = api.listNodesInEnvironment(PREFIX);
assertTrue(!nodeList.isEmpty());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/chef/internal/BaseStubbedOhaiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/internal/BaseStubbedOhaiLiveTest.java b/apis/chef/src/test/java/org/jclouds/chef/internal/BaseStubbedOhaiLiveTest.java
index 458fd02..b057e68 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/internal/BaseStubbedOhaiLiveTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/internal/BaseStubbedOhaiLiveTest.java
@@ -22,8 +22,8 @@ import org.jclouds.apis.ApiMetadata;
import org.jclouds.chef.ChefApi;
import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefBootstrapModule;
-import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.chef.config.ChefHttpApiModule;
+import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.domain.JsonBall;
import org.jclouds.ohai.AutomaticSupplier;
import org.jclouds.ohai.config.ConfiguresOhai;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java b/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java
index 94571d9..98b32dd 100644
--- a/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java
+++ b/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java
@@ -26,7 +26,7 @@ import java.util.Map;
import javax.inject.Inject;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.domain.JsonBall;
import org.jclouds.json.Json;
@@ -60,7 +60,7 @@ public class JMXTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule(), new JMXOhaiModule() {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java b/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java
index e2bed2e..d2749b3 100644
--- a/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java
+++ b/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java
@@ -25,7 +25,7 @@ import java.util.Properties;
import javax.inject.Inject;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.domain.JsonBall;
import org.jclouds.json.Json;
@@ -63,7 +63,7 @@ public class OhaiModuleTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule(), new OhaiModule() {
@Override
@@ -97,7 +97,7 @@ public class OhaiModuleTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule(), new OhaiModule() {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/353651d3/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java b/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java
index 27c1919..ed73769 100644
--- a/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java
+++ b/apis/chef/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java
@@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import org.jclouds.chef.ChefApi;
+import org.jclouds.chef.ChefApiMetadata;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.domain.JsonBall;
import org.jclouds.json.Json;
@@ -52,7 +52,7 @@ public class NestSlashKeysTest {
Injector injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApi.VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION);
}
}, new ChefParserModule(), new GsonModule());
converter = injector.getInstance(NestSlashKeys.class);