You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jclouds.apache.org by ahgittin <no...@github.com> on 2013/11/15 10:20:52 UTC
[jclouds] applies tidies for imageChooser (JCLOUDS-331) as suggested
in pull #202 (#207)
good suggestions in #202 @demobox, thanks
You can merge this Pull Request by running:
git pull https://github.com/ahgittin/jclouds imageChooser-tidy
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds/pull/207
-- Commit Summary --
* applies tidies for imageChooser (JCLOUDS-331) as suggested in pull #202
-- File Changes --
M apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java (1)
M compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java (2)
M compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java (2)
M compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java (140)
-- Patch Links --
https://github.com/jclouds/jclouds/pull/207.patch
https://github.com/jclouds/jclouds/pull/207.diff
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by Andrew Phillips <no...@github.com>.
> - imageNameAlt, new Function<TemplateBuilderImpl,TemplateBuilderImpl>() {
> - @Override
> - public TemplateBuilderImpl apply(TemplateBuilderImpl input) {
> - return input.imageChooser(input.imageChooserFromOrdering(new Ordering<Image>() {
> - private int score(Image img) {
> - if (img.getName().contains("alternate")) return 10;
> - return 0;
> - }
> - @Override
> - public int compare(Image left, Image right) {
> - return score(left) - score(right);
> - }
> - }));
> - }
> - });
> + Function<TemplateBuilderImpl,TemplateBuilderImpl> tbSortWithAlternate = new Function<TemplateBuilderImpl,TemplateBuilderImpl>() {
[minor] see above
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207/files#r7710271
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #409](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/409/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28637415
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by Andrew Phillips <no...@github.com>.
Applied to [master](https://git-wip-us.apache.org/repos/asf?p=jclouds.git;h=9a7336b)...thanks, @ahgittin!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28707445
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by ahgittin <no...@github.com>.
fixed the 3 inline whitespace code style items
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28636936
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds #624](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/624/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28561559
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #403](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/403/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28557815
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by Andrew Phillips <no...@github.com>.
> @@ -198,67 +215,68 @@ public int compare(Image left, Image right) {
> assertTrue(TemplateBuilderImpl.DEFAULT_IMAGE_ORDERING.compare(image64bit, imageArchNull) < 0, "wrong default image ordering");
> assertTrue(sorterPreferringNonNullArch.compare(image64bit, imageArchNull) > 0, "wrong custom image ordering");
>
> - // preferring null has been the default behaviour;
> - // see comments in TemplateBuilderImpl.DEFAULT_IMAGE_ORDERING
> - doTestResolveImages(Suppliers.<Set<? extends Image>> ofInstance(ImmutableSet.<Image> of(
> - image, imageArchNull, image64bit)),
> - image64bit, new Function<TemplateBuilderImpl,TemplateBuilderImpl>() {
> - @Override
> - public TemplateBuilderImpl apply(TemplateBuilderImpl input) {
> - return input.imageChooser(input.imageChooserFromOrdering(sorterPreferringNonNullArch));
> - }
> - });
> + Function<TemplateBuilderImpl,TemplateBuilderImpl> tbCustomiser = new Function<TemplateBuilderImpl,TemplateBuilderImpl>() {
[minor] Add space in `,TemplateBuilderImpl`
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207/files#r7710270
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by Andrew Phillips <no...@github.com>.
> - }
> - });
> - }
> - });
> - }
> -
> + Function<TemplateBuilderImpl,TemplateBuilderImpl> tbChooseAlternate = new Function<TemplateBuilderImpl,TemplateBuilderImpl>() {
> + @Override
> + public TemplateBuilderImpl apply(TemplateBuilderImpl input) {
> + return input.imageChooser(new Function<Iterable<? extends Image>, Image>() {
> + @Override
> + public Image apply(Iterable<? extends Image> input) {
> + return Iterables.find(input, new Predicate<Image>() {
> + @Override
> + public boolean apply(Image input) {
> + return input.getName()!=null && input.getName().contains("alternate");
[minor] spaces around `!=`?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207/files#r7710280
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #402](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/402/) UNSTABLE
Looks like there's a problem with this pull request
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28557625
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by Andrew Phillips <no...@github.com>.
@ahgittin: A couple of minor comments, but they shouldn't hold this one up. +1 - looks good to me, thanks!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28635134
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #865](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/865/) UNSTABLE
Looks like there's a problem with this pull request
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28557627
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #866](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/866/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28557833
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds #623](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/623/) UNSTABLE
Looks like there's a problem with this pull request
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28558895
Re: [jclouds] applies tidies for imageChooser (JCLOUDS-331) as
suggested in pull #202 (#207)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #872](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/872/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/207#issuecomment-28637428