Updated Branches: refs/heads/master 96a5d917f -> 2dabca6a2
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/2dabca6a/core/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java b/core/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java index ed73769..6d26cb6 100644 --- a/core/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java +++ b/core/src/test/java/org/jclouds/ohai/functions/NestSlashKeysTest.java @@ -52,7 +52,7 @@ public class NestSlashKeysTest { Injector injector = Guice.createInjector(new AbstractModule() { @Override protected void configure() { - bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION); + bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_API_VERSION); } }, new ChefParserModule(), new GsonModule()); converter = injector.getInstance(NestSlashKeys.class); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/2dabca6a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java ---------------------------------------------------------------------- diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java b/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java index c2867a2..a0a6d08 100644 --- a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java +++ b/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java @@ -62,7 +62,7 @@ public class EnterpriseChefApiMetadata extends BaseHttpApiMetadata<EnterpriseChe .name("Enterprise Chef Api") .identityName("User") .credentialName("Certificate") - .version(ChefApiMetadata.DEFAULT_VERSION) + .version(ChefApiMetadata.DEFAULT_API_VERSION) .documentation(URI.create("http://www.opscode.com/support";)) .defaultEndpoint("https://api.opscode.com";) .view(ChefContext.class) http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/2dabca6a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java index 98528c7..2a58dd0 100644 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java +++ b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java @@ -56,7 +56,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris signed(HttpRequest.builder() // .method("GET") // .endpoint("https://api.opscode.com/users/nacx";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON).build()), // HttpResponse.builder().statusCode(200) .payload(payloadFromResourceWithContentType("/user.json", MediaType.APPLICATION_JSON)) // @@ -71,7 +71,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() // .method("GET") // .endpoint("https://api.opscode.com/users/foo";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON) // .build()), // HttpResponse.builder().statusCode(404).build()); @@ -84,7 +84,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris signed(HttpRequest.builder() // .method("GET") // .endpoint("https://api.opscode.com/groups";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON).build()), // HttpResponse.builder().statusCode(200) .payload(payloadFromResourceWithContentType("/groups.json", MediaType.APPLICATION_JSON)) // @@ -100,7 +100,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris signed(HttpRequest.builder() // .method("GET") // .endpoint("https://api.opscode.com/groups/admins";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON).build()), // HttpResponse.builder().statusCode(200) .payload(payloadFromResourceWithContentType("/group.json", MediaType.APPLICATION_JSON)) // @@ -115,7 +115,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() // .method("GET") // .endpoint("https://api.opscode.com/groups/foo";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON) // .build()), // HttpResponse.builder().statusCode(404).build()); @@ -127,7 +127,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() // .method("POST") // .endpoint("https://api.opscode.com/groups";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON) // .payload(payloadFromStringWithContentType("{\"groupname\":\"foo\"}", MediaType.APPLICATION_JSON)) // .build()), // @@ -140,7 +140,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() // .method("DELETE") // .endpoint("https://api.opscode.com/groups/foo";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON) // .build()), // HttpResponse.builder().statusCode(200).build()); @@ -153,7 +153,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() // .method("DELETE") // .endpoint("https://api.opscode.com/groups/foo";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON) // .build()), // HttpResponse.builder().statusCode(404).build()); @@ -165,7 +165,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() // .method("PUT") // .endpoint("https://api.opscode.com/groups/admins";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON) // .payload(payloadFromResourceWithContentType("/group-update.json", MediaType.APPLICATION_JSON)) // .build()), // @@ -180,7 +180,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris EnterpriseChefApi api = requestSendsResponse(signed(HttpRequest.builder() // .method("PUT") // .endpoint("https://api.opscode.com/groups/admins";) // - .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_API_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON) // .payload(payloadFromResourceWithContentType("/group-update.json", MediaType.APPLICATION_JSON)) // .build()), // http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/2dabca6a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java index 478235b..26a599d 100644 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java +++ b/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java @@ -45,7 +45,7 @@ public class BindGroupToUpdateRequestJsonPayloadTest { private Injector injector = Guice.createInjector(new AbstractModule() { @Override protected void configure() { - bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_VERSION); + bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_API_VERSION); } }, new ChefParserModule(), new GsonModule());
