Repository: jclouds Updated Branches: refs/heads/master 34663f3c2 -> 2caf6ea86
Cleaned up ChefApi and ChefService interfaces Cleaned up and renamed some methods to have a more consistent naming, and improved the javadocs. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ef7b7f7c Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ef7b7f7c Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ef7b7f7c Branch: refs/heads/master Commit: ef7b7f7c527ee792a7d6859e3c0591c8c8477f5e Parents: 063dcc4 Author: Ignasi Barrera <[email protected]> Authored: Thu Sep 12 21:40:01 2013 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Fri Sep 13 17:55:02 2013 +0200 ---------------------------------------------------------------------- .../EnterpriseChefApiMetadata.java | 3 +-- .../EnterpriseChefApiExpectTest.java | 22 ++++++++++---------- .../EnterpriseChefProviderMetadataTest.java | 2 -- ...BindGroupToUpdateRequestJsonPayloadTest.java | 4 ++-- .../enterprisechef/binders/GroupNameTest.java | 1 - 5 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/ef7b7f7c/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java ---------------------------------------------------------------------- diff --git a/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java b/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java index 5251209..c2867a2 100644 --- a/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java +++ b/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApiMetadata.java @@ -20,7 +20,6 @@ import java.net.URI; import java.util.Properties; import org.jclouds.apis.ApiMetadata; -import org.jclouds.chef.ChefApi; import org.jclouds.chef.ChefApiMetadata; import org.jclouds.chef.ChefContext; import org.jclouds.chef.config.ChefBootstrapModule; @@ -63,7 +62,7 @@ public class EnterpriseChefApiMetadata extends BaseHttpApiMetadata<EnterpriseChe .name("Enterprise Chef Api") .identityName("User") .credentialName("Certificate") - .version(ChefApi.VERSION) + .version(ChefApiMetadata.DEFAULT_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/jclouds/blob/ef7b7f7c/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java b/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java index 1ee2bdf..98528c7 100644 --- a/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java +++ b/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java @@ -25,7 +25,7 @@ import java.util.Set; import javax.ws.rs.core.MediaType; import org.jclouds.chef.BaseChefApiExpectTest; -import org.jclouds.chef.ChefApi; +import org.jclouds.chef.ChefApiMetadata; import org.jclouds.date.TimeStamp; import org.jclouds.enterprisechef.config.EnterpriseChefHttpApiModule; import org.jclouds.enterprisechef.domain.Group; @@ -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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_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", ChefApi.VERSION) // + .addHeader("X-Chef-Version", ChefApiMetadata.DEFAULT_VERSION) // .addHeader("Accept", MediaType.APPLICATION_JSON) // .payload(payloadFromResourceWithContentType("/group-update.json", MediaType.APPLICATION_JSON)) // .build()), // http://git-wip-us.apache.org/repos/asf/jclouds/blob/ef7b7f7c/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java ---------------------------------------------------------------------- diff --git a/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java b/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java index 0b7ddc3..f6784a0 100644 --- a/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java +++ b/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadataTest.java @@ -16,8 +16,6 @@ */ package org.jclouds.enterprisechef; -import org.jclouds.enterprisechef.EnterpriseChefApiMetadata; -import org.jclouds.enterprisechef.EnterpriseChefProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadataTest; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds/blob/ef7b7f7c/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java ---------------------------------------------------------------------- diff --git a/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java b/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java index 29e120e..478235b 100644 --- a/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java +++ b/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java @@ -21,7 +21,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.enterprisechef.domain.Group; import org.jclouds.http.HttpRequest; @@ -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(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/ef7b7f7c/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java ---------------------------------------------------------------------- diff --git a/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java b/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java index ee8ff46..cbe6642 100644 --- a/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java +++ b/providers/enterprisechef/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java @@ -20,7 +20,6 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; -import org.jclouds.enterprisechef.binders.GroupName; import org.jclouds.enterprisechef.domain.Group; import org.testng.annotations.Test;
