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:32 UTC
[06/50] [abbrv] git commit: Improved javadoc and parameter naming
Improved javadoc and parameter naming
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/174531ed
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/174531ed
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/174531ed
Branch: refs/heads/master
Commit: 174531ed13a97ff1235f8aa3428f5458ef4a51d6
Parents: 353651d
Author: Ignasi Barrera <na...@apache.org>
Authored: Mon Sep 16 09:52:46 2013 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Sep 16 09:52:46 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/jclouds/chef/ChefApi.java | 130 +++++++++----------
.../java/org/jclouds/chef/ChefApiMetadata.java | 4 +-
.../main/java/org/jclouds/chef/ChefService.java | 30 ++---
.../chef/suppliers/ChefVersionSupplier.java | 6 +-
.../org/jclouds/chef/test/TransientChefApi.java | 32 ++---
.../org/jclouds/chef/ChefApiExpectTest.java | 8 +-
.../test/java/org/jclouds/chef/ChefApiTest.java | 84 ++++++------
.../BindHexEncodedMD5sToJsonPayloadTest.java | 2 +-
.../chef/functions/GroupToBootScriptTest.java | 2 +-
.../chef/functions/ParseClientFromJsonTest.java | 2 +-
.../ParseCookbookDefinitionFromJsonTest.java | 2 +-
.../ParseCookbookDefinitionFromJsonv10Test.java | 2 +-
...seCookbookDefinitionListFromJsonv10Test.java | 2 +-
.../ParseCookbookVersionFromJsonTest.java | 2 +-
.../ParseCookbookVersionsV09FromJsonTest.java | 2 +-
.../ParseCookbookVersionsV10FromJsonTest.java | 2 +-
.../functions/ParseDataBagItemFromJsonTest.java | 2 +-
.../chef/functions/ParseKeySetFromJsonTest.java | 2 +-
.../chef/functions/ParseNodeFromJsonTest.java | 2 +-
.../functions/ParseSandboxFromJsonTest.java | 2 +-
.../ParseSearchDataBagItemFromJsonTest.java | 2 +-
.../ParseUploadSandboxFromJsonTest.java | 2 +-
.../chef/functions/RunListForGroupTest.java | 2 +-
.../chef/suppliers/ChefVersionSupplierTest.java | 8 +-
.../java/org/jclouds/ohai/config/JMXTest.java | 2 +-
.../org/jclouds/ohai/config/OhaiModuleTest.java | 4 +-
.../ohai/functions/NestSlashKeysTest.java | 2 +-
27 files changed, 171 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java b/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java
index 877deb6..b8b4513 100644
--- a/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java
+++ b/apis/chef/src/main/java/org/jclouds/chef/ChefApi.java
@@ -98,7 +98,7 @@ public interface ChefApi extends Closeable {
// Clients
/**
- * List the names of the existing clients.
+ * Lists the names of the existing clients.
*
* @return The names of the existing clients.
*/
@@ -110,7 +110,7 @@ public interface ChefApi extends Closeable {
Set<String> listClients();
/**
- * Get the details of existing client.
+ * Gets the details of existing client.
*
* @param clientname The name of the client to get.
* @return The details of the given client.
@@ -119,7 +119,7 @@ public interface ChefApi extends Closeable {
@GET
@Path("/clients/{clientname}")
@Fallback(NullOnNotFoundOr404.class)
- Client getClient(@PathParam("clientname") String clientname);
+ Client getClient(@PathParam("clientname") String clientName);
/**
* Creates a new client.
@@ -132,7 +132,7 @@ public interface ChefApi extends Closeable {
@POST
@Path("/clients")
@MapBinder(BindToJsonPayload.class)
- Client createClient(@PayloadParam("name") String clientname);
+ Client createClient(@PayloadParam("name") String clientName);
/**
* Creates a new client with custom options.
@@ -146,10 +146,10 @@ public interface ChefApi extends Closeable {
@POST
@Path("/clients")
@MapBinder(BindCreateClientOptionsToJsonPayload.class)
- Client createClient(@PayloadParam("name") String clientname, CreateClientOptions options);
+ Client createClient(@PayloadParam("name") String clientName, CreateClientOptions options);
/**
- * Generate a new key-pair for this client, and return the new private key in
+ * Generates a new key-pair for this client, and return the new private key in
* the response body.
*
* @param clientname The name of the client.
@@ -159,7 +159,7 @@ public interface ChefApi extends Closeable {
@PUT
@Path("/clients/{clientname}")
Client generateKeyForClient(
- @PathParam("clientname") @BinderParam(BindGenerateKeyForClientToJsonPayload.class) String clientname);
+ @PathParam("clientname") @BinderParam(BindGenerateKeyForClientToJsonPayload.class) String clientName);
/**
* Deletes the given client.
@@ -171,12 +171,12 @@ public interface ChefApi extends Closeable {
@DELETE
@Path("/clients/{clientname}")
@Fallback(NullOnNotFoundOr404.class)
- Client deleteClient(@PathParam("clientname") String clientname);
+ Client deleteClient(@PathParam("clientname") String clientName);
// Cookbooks
/**
- * List the names of the existing cookbooks.
+ * Lists the names of the existing cookbooks.
*
* @return The names of the exsisting cookbooks.
*/
@@ -188,7 +188,7 @@ public interface ChefApi extends Closeable {
Set<String> listCookbooks();
/**
- * List the cookbooks that are available in the given environment.
+ * Lists the cookbooks that are available in the given environment.
*
* @param environmentname The name of the environment to get the cookbooks
* from.
@@ -201,10 +201,10 @@ public interface ChefApi extends Closeable {
@ResponseParser(ParseCookbookDefinitionListFromJsonv10.class)
@Path("/environments/{environmentname}/cookbooks")
@Fallback(NullOnNotFoundOr404.class)
- Set<CookbookDefinition> listCookbooksInEnvironment(@PathParam("environmentname") String environmentname);
+ Set<CookbookDefinition> listCookbooksInEnvironment(@PathParam("environmentname") String environmentName);
/**
- * List the cookbooks that are available in the given environment, limiting
+ * Lists the cookbooks that are available in the given environment, limiting
* the number of versions returned for each cookbook.
*
* @param environmentname The name of the environment.
@@ -219,11 +219,11 @@ public interface ChefApi extends Closeable {
@ResponseParser(ParseCookbookDefinitionListFromJsonv10.class)
@Path("/environments/{environmentname}/cookbooks?num_versions={numversions}")
@Fallback(NullOnNotFoundOr404.class)
- Set<CookbookDefinition> listCookbooksInEnvironment(@PathParam("environmentname") String environmentname,
- @PathParam("numversions") String numversions);
+ Set<CookbookDefinition> listCookbooksInEnvironment(@PathParam("environmentname") String environmentName,
+ @PathParam("numversions") String numVersions);
/**
- * List the available versions of the given cookbook.
+ * Lists the available versions of the given cookbook.
*
* @param cookbookName The name of the cookbook.
* @return The available versions of the given cookbook.
@@ -236,7 +236,7 @@ public interface ChefApi extends Closeable {
Set<String> listVersionsOfCookbook(@PathParam("cookbookname") String cookbookName);
/**
- * Get the details of the given cookbook, with the links to each resource
+ * Gets the details of the given cookbook, with the links to each resource
* such as recipe files, attributes, etc.
*
* @param cookbookName The name of the cookbook.
@@ -250,7 +250,7 @@ public interface ChefApi extends Closeable {
CookbookVersion getCookbook(@PathParam("cookbookname") String cookbookName, @PathParam("version") String version);
/**
- * Get the definition of the cookbook in the given environment.
+ * Gets the definition of the cookbook in the given environment.
*
* @param environmentname The name of the environment.
* @param cookbookname The name of the cookbook.
@@ -262,11 +262,11 @@ public interface ChefApi extends Closeable {
@GET
@ResponseParser(ParseCookbookDefinitionFromJsonv10.class)
@Path("/environments/{environmentname}/cookbooks/{cookbookname}")
- CookbookDefinition getCookbookInEnvironment(@PathParam("environmentname") String environmentname,
- @PathParam("cookbookname") String cookbookname);
+ CookbookDefinition getCookbookInEnvironment(@PathParam("environmentname") String environmentName,
+ @PathParam("cookbookname") String cookbookName);
/**
- * Get the definition of the cookbook in the given environment.
+ * Gets the definition of the cookbook in the given environment.
*
* @param environmentname The name of the environment.
* @param cookbookname The name of the cookbook.
@@ -280,11 +280,11 @@ public interface ChefApi extends Closeable {
@GET
@ResponseParser(ParseCookbookDefinitionFromJsonv10.class)
@Path("/environments/{environmentname}/cookbooks/{cookbookname}?num_versions={numversions}")
- CookbookDefinition getCookbookInEnvironment(@PathParam("environmentname") String environmentname,
- @PathParam("cookbookname") String cookbookname, @PathParam("numversions") String numversions);
+ CookbookDefinition getCookbookInEnvironment(@PathParam("environmentname") String environmentName,
+ @PathParam("cookbookname") String cookbookName, @PathParam("numversions") String numVersions);
/**
- * List the names of the recipes in the given environment.
+ * Lists the names of the recipes in the given environment.
*
* @param environmentname The name of the environment.
* @return The names of the recipes in the given environment.
@@ -294,7 +294,7 @@ public interface ChefApi extends Closeable {
@GET
@Path("/environments/{environmentname}/recipes")
@Fallback(EmptySetOnNotFoundOr404.class)
- Set<String> listRecipesInEnvironment(@PathParam("environmentname") String environmentname);
+ Set<String> listRecipesInEnvironment(@PathParam("environmentname") String environmentName);
/**
* Creates or updates the given cookbook.
@@ -311,7 +311,7 @@ public interface ChefApi extends Closeable {
@BinderParam(BindToJsonPayload.class) CookbookVersion cookbook);
/**
- * Delete the given cookbook.
+ * Deletes the given cookbook.
*
* @param cookbookName The name of the cookbook to delete.
* @param version The version of the cookbook to delete.
@@ -326,7 +326,7 @@ public interface ChefApi extends Closeable {
// Data bags
/**
- * List the names of the existing data bags.
+ * Lists the names of the existing data bags.
*
* @return The names of the existing data bags.
*/
@@ -359,7 +359,7 @@ public interface ChefApi extends Closeable {
void deleteDatabag(@PathParam("name") String databagName);
/**
- * List the names of the items in a data bag.
+ * Lists the names of the items in a data bag.
*
* @param databagName The name of the data bag.
* @return The names of the items in the given data bag.
@@ -372,7 +372,7 @@ public interface ChefApi extends Closeable {
Set<String> listDatabagItems(@PathParam("name") String databagName);
/**
- * Get an item in a data bag.
+ * Gets an item in a data bag.
*
* @param databagName The name of the data bag.
* @param databagItemId The identifier of the item to get.
@@ -399,7 +399,7 @@ public interface ChefApi extends Closeable {
@BinderParam(BindToJsonPayload.class) DatabagItem databagItem);
/**
- * Update an item in a data bag.
+ * Updates an item in a data bag.
*
* @param databagName The name of the data bag.
* @param item The new contents for the item in the data bag.
@@ -413,7 +413,7 @@ public interface ChefApi extends Closeable {
@PathParam("databagItemId") @ParamParser(DatabagItemId.class) @BinderParam(BindToJsonPayload.class) DatabagItem item);
/**
- * Delete an item from a data bag.
+ * Deletes an item from a data bag.
*
* @param databagName The name of the data bag.
* @param databagItemId The identifier of the item to delete.
@@ -429,7 +429,7 @@ public interface ChefApi extends Closeable {
// Environments
/**
- * List the names of the existing environments.
+ * Lists the names of the existing environments.
*
* @return The names of the existing environments.
*/
@@ -442,7 +442,7 @@ public interface ChefApi extends Closeable {
Set<String> listEnvironments();
/**
- * Get the details of an existing environment.
+ * Gets the details of an existing environment.
*
* @param environmentname The name of the environment to get.
* @return The details of the given environment.
@@ -452,10 +452,10 @@ public interface ChefApi extends Closeable {
@GET
@Path("/environments/{environmentname}")
@Fallback(NullOnNotFoundOr404.class)
- Environment getEnvironment(@PathParam("environmentname") String environmentname);
+ Environment getEnvironment(@PathParam("environmentname") String environmentName);
/**
- * Create a new environment.
+ * Creates a new environment.
*
* @param environment The environment to create.
*/
@@ -466,7 +466,7 @@ public interface ChefApi extends Closeable {
void createEnvironment(@BinderParam(BindToJsonPayload.class) Environment environment);
/**
- * Updated the given environment.
+ * Updates the given environment.
*
* @param environment The new details for the environment.
* @return The details of the updated environment.
@@ -479,7 +479,7 @@ public interface ChefApi extends Closeable {
@PathParam("environmentname") @ParamParser(EnvironmentName.class) @BinderParam(BindToJsonPayload.class) Environment environment);
/**
- * Delete the given environment.
+ * Deletes the given environment.
*
* @param environmentname The name of the environment to delete.
* @return The details of the deleted environment.
@@ -489,12 +489,12 @@ public interface ChefApi extends Closeable {
@DELETE
@Path("/environments/{environmentname}")
@Fallback(NullOnNotFoundOr404.class)
- Environment deleteEnvironment(@PathParam("environmentname") String environmentname);
+ Environment deleteEnvironment(@PathParam("environmentname") String environmentName);
// Nodes
/**
- * List the names of the existing nodes.
+ * Lists the names of the existing nodes.
*
* @return The names of the existing nodes.
*/
@@ -506,7 +506,7 @@ public interface ChefApi extends Closeable {
Set<String> listNodes();
/**
- * List the names of the nodes in the given environment.
+ * Lists the names of the nodes in the given environment.
*
* @param environmentname The name of the environment.
* @return The names of the existing nodes in the given environment.
@@ -517,10 +517,10 @@ public interface ChefApi extends Closeable {
@Path("/environments/{environmentname}/nodes")
@ResponseParser(ParseKeySetFromJson.class)
@Fallback(EmptySetOnNotFoundOr404.class)
- Set<String> listNodesInEnvironment(@PathParam("environmentname") String environmentname);
+ Set<String> listNodesInEnvironment(@PathParam("environmentname") String environmentName);
/**
- * Get the details of the given node.
+ * Gets the details of the given node.
*
* @param nodename The name of the node to get.
* @return The details of the given node.
@@ -529,10 +529,10 @@ public interface ChefApi extends Closeable {
@GET
@Path("/nodes/{nodename}")
@Fallback(NullOnNotFoundOr404.class)
- Node getNode(@PathParam("nodename") String nodename);
+ Node getNode(@PathParam("nodename") String nodeName);
/**
- * Create a new node.
+ * Creates a new node.
*
* @param node The details of the node to create.
*/
@@ -542,7 +542,7 @@ public interface ChefApi extends Closeable {
void createNode(@BinderParam(BindToJsonPayload.class) Node node);
/**
- * Update an existing node.
+ * Updates an existing node.
*
* @param node The new details for the node.
* @return The details of the updated node.
@@ -553,7 +553,7 @@ public interface ChefApi extends Closeable {
Node updateNode(@PathParam("nodename") @ParamParser(NodeName.class) @BinderParam(BindToJsonPayload.class) Node node);
/**
- * Delete the given node.
+ * Deletes the given node.
*
* @param nodename The name of the node to delete.
* @return The details of the deleted node.
@@ -562,12 +562,12 @@ public interface ChefApi extends Closeable {
@DELETE
@Path("/nodes/{nodename}")
@Fallback(NullOnNotFoundOr404.class)
- Node deleteNode(@PathParam("nodename") String nodename);
+ Node deleteNode(@PathParam("nodename") String nodeName);
// Roles
/**
- * List the names of the existing roles.
+ * Lists the names of the existing roles.
*
* @return The names of the existing roles.
*/
@@ -579,7 +579,7 @@ public interface ChefApi extends Closeable {
Set<String> listRoles();
/**
- * Get the details of the given role.
+ * Gets the details of the given role.
*
* @param rolename The name of the role to get.
* @return The details of the given role.
@@ -588,10 +588,10 @@ public interface ChefApi extends Closeable {
@GET
@Path("/roles/{rolename}")
@Fallback(NullOnNotFoundOr404.class)
- Role getRole(@PathParam("rolename") String rolename);
+ Role getRole(@PathParam("rolename") String roleName);
/**
- * Create a new role.
+ * Creates a new role.
*
* @param role The details for the new role.
*/
@@ -601,7 +601,7 @@ public interface ChefApi extends Closeable {
void createRole(@BinderParam(BindToJsonPayload.class) Role role);
/**
- * Update the given role.
+ * Updates the given role.
*
* @param role The new details for the role.
* @return The details of the updated role.
@@ -612,7 +612,7 @@ public interface ChefApi extends Closeable {
Role updateRole(@PathParam("rolename") @ParamParser(RoleName.class) @BinderParam(BindToJsonPayload.class) Role role);
/**
- * Delete the given role.
+ * Deletes the given role.
*
* @param rolename The name of the role to delete.
* @return The details of the deleted role.
@@ -621,7 +621,7 @@ public interface ChefApi extends Closeable {
@DELETE
@Path("/roles/{rolename}")
@Fallback(NullOnNotFoundOr404.class)
- Role deleteRole(@PathParam("rolename") String rolename);
+ Role deleteRole(@PathParam("rolename") String roleName);
// Sandboxes
@@ -656,7 +656,7 @@ public interface ChefApi extends Closeable {
void uploadContent(@EndpointParam URI location, Payload content);
/**
- * Get the contents of the given resource.
+ * Gets the contents of the given resource.
*
* @param resource The resource to get.
* @return An input stream for the content of the requested resource.
@@ -684,7 +684,7 @@ public interface ChefApi extends Closeable {
// Search
/**
- * List the names of the available search indexes.
+ * Lists the names of the available search indexes.
* <p>
* By default, the "role", "node" and "api" indexes will always be available.
* <p>
@@ -703,7 +703,7 @@ public interface ChefApi extends Closeable {
Set<String> listSearchIndexes();
/**
- * Search all clients.
+ * Searches all clients.
* <p>
* Note that without any request parameters this will return all of the data
* within the index.
@@ -719,7 +719,7 @@ public interface ChefApi extends Closeable {
SearchResult<? extends Client> searchClients();
/**
- * Search all clients that match the given options.
+ * Searches all clients that match the given options.
*
* @return The response contains the total number of rows that matched the
* request, the position this result set returns (useful for paging)
@@ -732,7 +732,7 @@ public interface ChefApi extends Closeable {
SearchResult<? extends Client> searchClients(SearchOptions options);
/**
- * Search all items in a data bag.
+ * Searches all items in a data bag.
* <p>
* Note that without any request parameters this will return all of the data
* within the index.
@@ -748,7 +748,7 @@ public interface ChefApi extends Closeable {
SearchResult<? extends DatabagItem> searchDatabagItems(@PathParam("databagName") String databagName);
/**
- * Search all items in a data bag that match the given options.
+ * Searches all items in a data bag that match the given options.
*
* @return The response contains the total number of rows that matched the
* request, the position this result set returns (useful for paging)
@@ -762,7 +762,7 @@ public interface ChefApi extends Closeable {
SearchOptions options);
/**
- * Search all environments.
+ * Searches all environments.
* <p>
* Note that without any request parameters this will return all of the data
* within the index.
@@ -779,7 +779,7 @@ public interface ChefApi extends Closeable {
SearchResult<? extends Environment> searchEnvironments();
/**
- * Search all environments that match the given options.
+ * Searches all environments that match the given options.
*
* @return The response contains the total number of rows that matched the
* request, the position this result set returns (useful for paging)
@@ -793,7 +793,7 @@ public interface ChefApi extends Closeable {
SearchResult<? extends Environment> searchEnvironments(SearchOptions options);
/**
- * Search all nodes.
+ * Searches all nodes.
* <p>
* Note that without any request parameters this will return all of the data
* within the index.
@@ -809,7 +809,7 @@ public interface ChefApi extends Closeable {
SearchResult<? extends Node> searchNodes();
/**
- * Search all nodes that match the given options.
+ * Searches all nodes that match the given options.
*
* @return The response contains the total number of rows that matched the
* request, the position this result set returns (useful for paging)
@@ -822,7 +822,7 @@ public interface ChefApi extends Closeable {
SearchResult<? extends Node> searchNodes(SearchOptions options);
/**
- * Search all roles.
+ * Searches all roles.
* <p>
* Note that without any request parameters this will return all of the data
* within the index.
@@ -838,7 +838,7 @@ public interface ChefApi extends Closeable {
SearchResult<? extends Role> searchRoles();
/**
- * Search all roles that match the given options.
+ * Searches all roles that match the given options.
*
* @return The response contains the total number of rows that matched the
* request, the position this result set returns (useful for paging)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java b/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
index d767fdd..e28b481 100644
--- a/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
+++ b/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
@@ -48,7 +48,7 @@ public class ChefApiMetadata extends BaseHttpApiMetadata<ChefApi> {
/**
* The default Chef Server API version to use.
*/
- public static final String DEFAULT_VERSION = "0.10.8";
+ public static final String DEFAULT_API_VERSION = "0.10.8";
@Override
public Builder toBuilder() {
@@ -88,7 +88,7 @@ public class ChefApiMetadata extends BaseHttpApiMetadata<ChefApi> {
.name("OpsCode Chef Api")
.identityName("User")
.credentialName("Certificate")
- .version(DEFAULT_VERSION)
+ .version(DEFAULT_API_VERSION)
.documentation(URI.create("http://wiki.opscode.com/display/chef/Server+API"))
.defaultEndpoint("http://localhost:4000")
.defaultProperties(ChefApiMetadata.defaultProperties())
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/apis/chef/src/main/java/org/jclouds/chef/ChefService.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/java/org/jclouds/chef/ChefService.java b/apis/chef/src/main/java/org/jclouds/chef/ChefService.java
index f1c431b..cf6993f 100644
--- a/apis/chef/src/main/java/org/jclouds/chef/ChefService.java
+++ b/apis/chef/src/main/java/org/jclouds/chef/ChefService.java
@@ -45,7 +45,7 @@ import com.google.inject.ImplementedBy;
public interface ChefService {
/**
- * Get the context that created this service.
+ * Gets the context that created this service.
*
* @return The context that created the service.
*/
@@ -54,7 +54,7 @@ public interface ChefService {
// Crypto
/**
- * Encrypt the given input stream.
+ * Encrypts the given input stream.
*
* @param supplier The input stream to encrypt.
* @return The encrypted bytes for the given input stream.
@@ -63,7 +63,7 @@ public interface ChefService {
byte[] encrypt(InputSupplier<? extends InputStream> supplier) throws IOException;
/**
- * Decrypt the given input stream.
+ * Decrypts the given input stream.
*
* @param supplier The input stream to decrypt.
* @return The decrypted bytes for the given input stream.
@@ -94,7 +94,7 @@ public interface ChefService {
void updateBootstrapConfigForGroup(String group, BootstrapConfig bootstrapConfig);
/**
- * Get the run list for the given group.
+ * Gets the run list for the given group.
*
* @param The group to get the configured run list for.
* @return run list for all nodes bootstrapped with a certain group
@@ -102,7 +102,7 @@ public interface ChefService {
List<String> getRunListForGroup(String group);
/**
- * Get the bootstrap configuration for a given group.
+ * Gets the bootstrap configuration for a given group.
* <p>
* The bootstrap configuration is a Json object containing the run list and
* the configured attributes.
@@ -112,7 +112,7 @@ public interface ChefService {
*/
public JsonBall getBootstrapConfigForGroup(String group);
- // Nodes
+ // Nodes / Clients
/**
* Creates a new node and populates the automatic attributes.
@@ -126,14 +126,14 @@ public interface ChefService {
Node createNodeAndPopulateAutomaticAttributes(String nodeName, Iterable<String> runList);
/**
- * Update and populate the automatic attributes of the given node.
+ * Updates and populate the automatic attributes of the given node.
*
* @param nodeName The node to update.
*/
void updateAutomaticAttributesOnNode(String nodeName);
/**
- * Remove the nodes and clients that have been inactive for a given amount of
+ * Removes the nodes and clients that have been inactive for a given amount of
* time.
*
* @param prefix The prefix for the nodes and clients to delete.
@@ -143,28 +143,28 @@ public interface ChefService {
void cleanupStaleNodesAndClients(String prefix, int secondsStale);
/**
- * Delete the given nodes.
+ * Deletes the given nodes.
*
* @param names The names of the nodes to delete.
*/
void deleteAllNodesInList(Iterable<String> names);
/**
- * Delete the given clients.
+ * Deletes the given clients.
*
* @param names The names of the client to delete.
*/
void deleteAllClientsInList(Iterable<String> names);
/**
- * List the details of all existing nodes.
+ * Lists the details of all existing nodes.
*
* @return The details of all existing nodes.
*/
Iterable<? extends Node> listNodes();
/**
- * List the details of all existing nodes in the given environment.
+ * Lists the details of all existing nodes in the given environment.
*
* @param environmentName The name fo the environment.
* @return The details of all existing nodes in the given environment.
@@ -173,21 +173,21 @@ public interface ChefService {
Iterable<? extends Node> listNodesInEnvironment(String environmentName);
/**
- * List the details of all existing clients.
+ * Lists the details of all existing clients.
*
* @return The details of all existing clients.
*/
Iterable<? extends Client> listClients();
/**
- * List the details of all existing cookbooks.
+ * Lists the details of all existing cookbooks.
*
* @return The details of all existing cookbooks.
*/
Iterable<? extends CookbookVersion> listCookbookVersions();
/**
- * List the details of all existing environments.
+ * Lists the details of all existing environments.
*
* @return The details of all existing environments.
*/
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
index a08fc40..7f7f4e9 100644
--- a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
+++ b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
@@ -42,7 +42,7 @@ import com.google.common.base.Supplier;
public class ChefVersionSupplier implements Supplier<Integer> {
/** The default version to assume in case we can not parse it. */
- public static final Integer DEFAULT_VERSION = 10;
+ public static final Integer FALLBACK_VERSION = 10;
@Resource
@Named(ChefProperties.CHEF_LOGGER)
@@ -65,8 +65,8 @@ public class ChefVersionSupplier implements Supplier<Integer> {
Matcher m = versionPattern.matcher(apiVersion);
if (!m.matches()) {
logger.warn("Configured version does not match the standard version pattern. Assuming version %s",
- DEFAULT_VERSION);
- return DEFAULT_VERSION;
+ FALLBACK_VERSION);
+ return FALLBACK_VERSION;
}
return Integer.valueOf(firstNonNull(m.group(1), m.group(2)));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/apis/chef/src/main/java/org/jclouds/chef/test/TransientChefApi.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/java/org/jclouds/chef/test/TransientChefApi.java b/apis/chef/src/main/java/org/jclouds/chef/test/TransientChefApi.java
index 2245826..812fd29 100644
--- a/apis/chef/src/main/java/org/jclouds/chef/test/TransientChefApi.java
+++ b/apis/chef/src/main/java/org/jclouds/chef/test/TransientChefApi.java
@@ -109,12 +109,12 @@ public class TransientChefApi implements ChefApi {
}
@Override
- public Client createClient(String clientname) {
+ public Client createClient(String clientName) {
throw new UnsupportedOperationException();
}
@Override
- public Client createClient(String clientname, CreateClientOptions options) {
+ public Client createClient(String clientName, CreateClientOptions options) {
throw new UnsupportedOperationException();
}
@@ -141,7 +141,7 @@ public class TransientChefApi implements ChefApi {
}
@Override
- public Client deleteClient(String clientname) {
+ public Client deleteClient(String clientName) {
throw new UnsupportedOperationException();
}
@@ -163,7 +163,7 @@ public class TransientChefApi implements ChefApi {
}
@Override
- public Node deleteNode(String nodename) {
+ public Node deleteNode(String nodeName) {
throw new UnsupportedOperationException();
}
@@ -173,12 +173,12 @@ public class TransientChefApi implements ChefApi {
}
@Override
- public Client generateKeyForClient(String clientname) {
+ public Client generateKeyForClient(String clientName) {
throw new UnsupportedOperationException();
}
@Override
- public Client getClient(String clientname) {
+ public Client getClient(String clientName) {
throw new UnsupportedOperationException();
}
@@ -193,12 +193,12 @@ public class TransientChefApi implements ChefApi {
}
@Override
- public Node getNode(String nodename) {
+ public Node getNode(String nodeName) {
throw new UnsupportedOperationException();
}
@Override
- public Role getRole(String rolename) {
+ public Role getRole(String roleName) {
throw new UnsupportedOperationException();
}
@@ -328,12 +328,12 @@ public class TransientChefApi implements ChefApi {
}
@Override
- public Environment deleteEnvironment(String environmentname) {
+ public Environment deleteEnvironment(String environmentName) {
throw new UnsupportedOperationException();
}
@Override
- public Environment getEnvironment(String environmentname) {
+ public Environment getEnvironment(String environmentName) {
throw new UnsupportedOperationException();
}
@@ -343,22 +343,22 @@ public class TransientChefApi implements ChefApi {
}
@Override
- public Set<CookbookDefinition> listCookbooksInEnvironment(String environmentname) {
+ public Set<CookbookDefinition> listCookbooksInEnvironment(String environmentName) {
throw new UnsupportedOperationException();
}
@Override
- public Set<CookbookDefinition> listCookbooksInEnvironment(String environmentname, String numversions) {
+ public Set<CookbookDefinition> listCookbooksInEnvironment(String environmentName, String numVersions) {
throw new UnsupportedOperationException();
}
@Override
- public CookbookDefinition getCookbookInEnvironment(String environmentname, String cookbookname) {
+ public CookbookDefinition getCookbookInEnvironment(String environmentName, String cookbookName) {
throw new UnsupportedOperationException();
}
@Override
- public CookbookDefinition getCookbookInEnvironment(String environmentname, String cookbookname, String numversions) {
+ public CookbookDefinition getCookbookInEnvironment(String environmentName, String cookbookName, String numVersions) {
throw new UnsupportedOperationException();
}
@@ -373,12 +373,12 @@ public class TransientChefApi implements ChefApi {
}
@Override
- public Set<String> listRecipesInEnvironment(String environmentname) {
+ public Set<String> listRecipesInEnvironment(String environmentName) {
throw new UnsupportedOperationException();
}
@Override
- public Set<String> listNodesInEnvironment(String environmentname) {
+ public Set<String> listNodesInEnvironment(String environmentName) {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java b/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
index 8cabec4..f19b2ef 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/ChefApiExpectTest.java
@@ -49,7 +49,7 @@ public class ChefApiExpectTest extends BaseChefApiExpectTest<ChefApi> {
signed(HttpRequest.builder() //
.method("GET") //
.endpoint("http://localhost:4000/environments/dev/recipes") //
- .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("/environment_recipes.json", MediaType.APPLICATION_JSON)) //
@@ -64,7 +64,7 @@ public class ChefApiExpectTest extends BaseChefApiExpectTest<ChefApi> {
signed(HttpRequest.builder() //
.method("GET") //
.endpoint("http://localhost:4000/environments/dev/recipes") //
- .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());
@@ -77,7 +77,7 @@ public class ChefApiExpectTest extends BaseChefApiExpectTest<ChefApi> {
signed(HttpRequest.builder() //
.method("GET") //
.endpoint("http://localhost:4000/environments/dev/nodes") //
- .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("/environment_nodes.json", MediaType.APPLICATION_JSON)) //
@@ -92,7 +92,7 @@ public class ChefApiExpectTest extends BaseChefApiExpectTest<ChefApi> {
signed(HttpRequest.builder() //
.method("GET") //
.endpoint("http://localhost:4000/environments/dev/nodes") //
- .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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 7cf9c40..5ca105d 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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, "{\"is_completed\":true}", "application/json", false);
@@ -102,7 +102,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -215,7 +215,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
.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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -779,7 +779,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_VERSION
+ "-test\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -797,7 +797,7 @@ public class ChefApiTest extends BaseAsyncApiTest<ChefApi> {
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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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: " + ChefApiMetadata.DEFAULT_VERSION
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nX-Chef-Version: " + ChefApiMetadata.DEFAULT_API_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, ChefApiMetadata.DEFAULT_VERSION + "-test");
+ props.put(Constants.PROPERTY_API_VERSION, ChefApiMetadata.DEFAULT_API_VERSION + "-test");
return props;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 c929dad..cd40808 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
@@ -45,7 +45,7 @@ public class BindHexEncodedMD5sToJsonPayloadTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 42b826a..7b51f04 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
@@ -71,7 +71,7 @@ public class GroupToBootScriptTest {
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);
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/174531ed/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 226697f..7685a95 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
@@ -66,7 +66,7 @@ public class ParseClientFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 77c16f7..a89da9a 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
@@ -48,7 +48,7 @@ public class ParseCookbookDefinitionFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 9a47c1d..0df9d64 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
@@ -45,7 +45,7 @@ public class ParseCookbookDefinitionFromJsonv10Test {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 51a3f6d..b39343d 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
@@ -46,7 +46,7 @@ public class ParseCookbookDefinitionListFromJsonv10Test {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 438d725..9a279b4 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
@@ -59,7 +59,7 @@ public class ParseCookbookVersionFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 797e0a6..77128d0 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
@@ -48,7 +48,7 @@ public class ParseCookbookVersionsV09FromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 a0d6670..0d14c31 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
@@ -48,7 +48,7 @@ public class ParseCookbookVersionsV10FromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 b8c3744..cab8d8a 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
@@ -50,7 +50,7 @@ public class ParseDataBagItemFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 31341e5..82e6d90 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
@@ -48,7 +48,7 @@ public class ParseKeySetFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 57da4c4..f0b8a7d 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
@@ -52,7 +52,7 @@ public class ParseNodeFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 1a0d333..781b7a6 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
@@ -53,7 +53,7 @@ public class ParseSandboxFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 ae29e1c..c506d61 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
@@ -46,7 +46,7 @@ public class ParseSearchDataBagItemFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 a5d2bfb..e242992 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
@@ -56,7 +56,7 @@ public class ParseUploadSandboxFromJsonTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 8da3e79..fdb1c52 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
@@ -49,7 +49,7 @@ public class RunListForGroupTest {
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());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/apis/chef/src/test/java/org/jclouds/chef/suppliers/ChefVersionSupplierTest.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/test/java/org/jclouds/chef/suppliers/ChefVersionSupplierTest.java b/apis/chef/src/test/java/org/jclouds/chef/suppliers/ChefVersionSupplierTest.java
index 7bde5ac..a32359d 100644
--- a/apis/chef/src/test/java/org/jclouds/chef/suppliers/ChefVersionSupplierTest.java
+++ b/apis/chef/src/test/java/org/jclouds/chef/suppliers/ChefVersionSupplierTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.chef.suppliers;
-import static org.jclouds.chef.suppliers.ChefVersionSupplier.DEFAULT_VERSION;
+import static org.jclouds.chef.suppliers.ChefVersionSupplier.FALLBACK_VERSION;
import static org.testng.Assert.assertEquals;
import org.testng.annotations.Test;
@@ -30,9 +30,9 @@ import org.testng.annotations.Test;
public class ChefVersionSupplierTest {
public void testReturnsDefaultVersion() {
- assertEquals(new ChefVersionSupplier("15").get(), DEFAULT_VERSION);
- assertEquals(new ChefVersionSupplier("0").get(), DEFAULT_VERSION);
- assertEquals(new ChefVersionSupplier("0.").get(), DEFAULT_VERSION);
+ assertEquals(new ChefVersionSupplier("15").get(), FALLBACK_VERSION);
+ assertEquals(new ChefVersionSupplier("0").get(), FALLBACK_VERSION);
+ assertEquals(new ChefVersionSupplier("0.").get(), FALLBACK_VERSION);
}
public void testReturnsMajorVersionIfNotZero() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 98b32dd..f3f12c6 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
@@ -60,7 +60,7 @@ public class JMXTest {
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(), new JMXOhaiModule() {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/174531ed/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 d2749b3..ca600a1 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
@@ -63,7 +63,7 @@ public class OhaiModuleTest {
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(), 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(ChefApiMetadata.DEFAULT_VERSION);
+ bind(String.class).annotatedWith(ApiVersion.class).toInstance(ChefApiMetadata.DEFAULT_API_VERSION);
}
}, new ChefParserModule(), new GsonModule(), new OhaiModule() {
@Override