Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added missing toString on anonymous predicates

This commit is contained in:
Adrian Cole 2010-10-24 19:21:47 -05:00
parent 78e39c688a
commit ed6c6e2605
1 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
View File

@ -180,6 +180,10 @@ public class TemplateBuilderImpl implements TemplateBuilder {
return returnVal; return returnVal;
} }
@Override
public String toString() {
return "osFamily(" + osFamily + ")";
}
}; };
private final Predicate<OperatingSystem> osNamePredicate = new Predicate<OperatingSystem>() { private final Predicate<OperatingSystem> osNamePredicate = new Predicate<OperatingSystem>() {
@ -395,16 +399,16 @@ public class TemplateBuilderImpl implements TemplateBuilder {
}; };
static final Ordering<Image> DEFAULT_IMAGE_ORDERING = new Ordering<Image>() { static final Ordering<Image> DEFAULT_IMAGE_ORDERING = new Ordering<Image>() {
public int compare(Image left, Image right) { public int compare(Image left, Image right) {
return ComparisonChain.start().compare(left.getName(), right.getName(), return ComparisonChain.start()
Ordering.<String> natural().nullsLast()).compare(left.getVersion(), right.getVersion(), .compare(left.getName(), right.getName(), Ordering.<String> natural().nullsLast())
Ordering.<String> natural().nullsLast()).compare(left.getOperatingSystem().getName(), .compare(left.getVersion(), right.getVersion(), Ordering.<String> natural().nullsLast())
right.getOperatingSystem().getName(),// .compare(left.getOperatingSystem().getName(), right.getOperatingSystem().getName(),//
Ordering.<String> natural().nullsLast()).compare(left.getOperatingSystem().getVersion(), Ordering.<String> natural().nullsLast())
right.getOperatingSystem().getVersion(),// .compare(left.getOperatingSystem().getVersion(), right.getOperatingSystem().getVersion(),//
Ordering.<String> natural().nullsLast()).compare(left.getOperatingSystem().getDescription(), Ordering.<String> natural().nullsLast())
right.getOperatingSystem().getDescription(),// .compare(left.getOperatingSystem().getDescription(), right.getOperatingSystem().getDescription(),//
Ordering.<String> natural().nullsLast()).compare(left.getOperatingSystem().getArch(), Ordering.<String> natural().nullsLast())
right.getOperatingSystem().getArch()).result(); .compare(left.getOperatingSystem().getArch(), right.getOperatingSystem().getArch()).result();
} }
}; };
@ -637,7 +641,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
@Override @Override
public String toString() { public String toString() {
return locationPredicate.toString(); return "location(" + location + ")";
} }
}); });
@ -826,9 +830,8 @@ public class TemplateBuilderImpl implements TemplateBuilder {
@VisibleForTesting @VisibleForTesting
boolean nothingChangedExceptOptions() { boolean nothingChangedExceptOptions() {
return osFamily == null && location == null && imageId == null && hardwareId == null && osName == null return osFamily == null && location == null && imageId == null && hardwareId == null && osName == null
&& osDescription == null && imageVersion == null && osVersion == null && osArch == null && osDescription == null && imageVersion == null && osVersion == null && osArch == null && os64Bit == null
&& os64Bit == null && imageName == null && imageDescription == null && minCores == 0 && minRam == 0 && imageName == null && imageDescription == null && minCores == 0 && minRam == 0 && !biggest && !fastest;
&& !biggest && !fastest;
} }
/** /**
@ -842,10 +845,10 @@ public class TemplateBuilderImpl implements TemplateBuilder {
@Override @Override
public String toString() { public String toString() {
return "[biggest=" + biggest + ", fastest=" + fastest + ", imageName=" + imageName + ", imageDescription=" return "[biggest=" + biggest + ", fastest=" + fastest + ", imageName=" + imageName + ", imageDescription="
+ imageDescription + ", imageId=" + imageId + ", imageVersion=" + imageVersion + ", location=" + imageDescription + ", imageId=" + imageId + ", imageVersion=" + imageVersion + ", location=" + location
+ location + ", minCores=" + minCores + ", minRam=" + minRam + ", osFamily=" + osFamily + ", osName=" + ", minCores=" + minCores + ", minRam=" + minRam + ", osFamily=" + osFamily + ", osName=" + osName
+ osName + ", osDescription=" + osDescription + ", osVersion=" + osVersion + ", osArch=" + osArch + ", osDescription=" + osDescription + ", osVersion=" + osVersion + ", osArch=" + osArch + ", os64Bit="
+ ", os64Bit=" + os64Bit + ", hardwareId=" + hardwareId + "]"; + os64Bit + ", hardwareId=" + hardwareId + "]";
} }
@Override @Override