Updated Branches: refs/heads/master 756fe9bff -> 7e4db4d57
Use meaningful parameter name in ParseSearchResultFromJson and ParseSearchDatabagFromJson. Also use static import for Sets and Iterables. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/commit/7e4db4d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/tree/7e4db4d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/diff/7e4db4d5 Branch: refs/heads/master Commit: 7e4db4d57ec0eead9366dab4516912a4c3abf512 Parents: 756fe9b Author: Noorul Islam K M <[email protected]> Authored: Wed Sep 18 14:09:18 2013 +0530 Committer: Ignasi Barrera <[email protected]> Committed: Thu Sep 19 08:38:24 2013 +0200 ---------------------------------------------------------------------- .../chef/functions/ParseCookbookVersionsV09FromJson.java | 6 +++--- .../chef/functions/ParseCookbookVersionsV10FromJson.java | 9 +++++---- .../jclouds/chef/functions/ParseSearchDatabagFromJson.java | 8 ++++---- .../jclouds/chef/functions/ParseSearchResultFromJson.java | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/7e4db4d5/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJson.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJson.java b/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJson.java index f5c0487..5c94e41 100644 --- a/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJson.java +++ b/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV09FromJson.java @@ -26,7 +26,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; import com.google.common.base.Function; -import com.google.common.collect.Iterables; +import static com.google.common.collect.Iterables.getFirst; /** * Parses the cookbook versions in a Chef Server <= 0.9.8. @@ -44,8 +44,8 @@ public class ParseCookbookVersionsV09FromJson implements Function<HttpResponse, } @Override - public Set<String> apply(HttpResponse arg0) { - return Iterables.getFirst(json.apply(arg0).values(), null); + public Set<String> apply(HttpResponse response) { + return getFirst(json.apply(response).values(), null); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/7e4db4d5/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJson.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJson.java b/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJson.java index 4a34374..955fe8e 100644 --- a/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJson.java +++ b/core/src/main/java/org/jclouds/chef/functions/ParseCookbookVersionsV10FromJson.java @@ -28,8 +28,9 @@ import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; import com.google.common.base.Function; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; +import static com.google.common.collect.Iterables.getFirst; +import static com.google.common.collect.Iterables.transform; +import static com.google.common.collect.Sets.newLinkedHashSet; /** * Parses the cookbook versions in a Chef Server >= 0.10.8. @@ -49,8 +50,8 @@ public class ParseCookbookVersionsV10FromJson implements Function<HttpResponse, @Override public Set<String> apply(HttpResponse response) { - CookbookDefinition def = Iterables.getFirst(parser.apply(response).values(), null); - return Sets.newLinkedHashSet(Iterables.transform(def.getVersions(), new Function<Version, String>() { + CookbookDefinition def = getFirst(parser.apply(response).values(), null); + return newLinkedHashSet(transform(def.getVersions(), new Function<Version, String>() { @Override public String apply(Version input) { return input.getVersion(); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/7e4db4d5/core/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java b/core/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java index 90aebd3..4826b38 100644 --- a/core/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java +++ b/core/src/main/java/org/jclouds/chef/functions/ParseSearchDatabagFromJson.java @@ -29,8 +29,8 @@ import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; import com.google.common.base.Function; -import com.google.common.collect.Iterables; import com.google.gson.annotations.SerializedName; +import static com.google.common.collect.Iterables.transform; /** * Parses the search result into a {@link DatabagItem} object. @@ -64,9 +64,9 @@ public class ParseSearchDatabagFromJson implements Function<HttpResponse, Search } @Override - public SearchResult<DatabagItem> apply(HttpResponse arg0) { - Response returnVal = responseParser.apply(arg0); - Iterable<DatabagItem> items = Iterables.transform(returnVal.rows, new Function<Row, DatabagItem>() { + public SearchResult<DatabagItem> apply(HttpResponse response) { + Response returnVal = responseParser.apply(response); + Iterable<DatabagItem> items = transform(returnVal.rows, new Function<Row, DatabagItem>() { @Override public DatabagItem apply(Row input) { return json.fromJson(input.rawData.toString(), DatabagItem.class); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/7e4db4d5/core/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java b/core/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java index 2346638..983ce8f 100644 --- a/core/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java +++ b/core/src/main/java/org/jclouds/chef/functions/ParseSearchResultFromJson.java @@ -46,8 +46,8 @@ public class ParseSearchResultFromJson<T> implements Function<HttpResponse, Sear } @Override - public SearchResult<T> apply(HttpResponse arg0) { - Response<T> returnVal = json.apply(arg0); + public SearchResult<T> apply(HttpResponse response) { + Response<T> returnVal = json.apply(response); return new SearchResult<T>(returnVal.start, returnVal.rows); } }
