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

Use varargs for tags() to make life easier for callers; preserve tag order for easier unit testing

This commit is contained in:
Alasdair Hodge 2011-12-21 12:59:59 +00:00
parent 3f0f782f9d
commit c13e6e20bc
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/options/CloneDriveOptions.java
View File

@ -21,6 +21,7 @@ package org.jclouds.cloudsigma.options;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -61,16 +62,18 @@ public class CloneDriveOptions {
return this; return this;
} }
public CloneDriveOptions tags(Iterable<String> tags) { public CloneDriveOptions tags(String... tags) {
// Affinity is conveyed using regular tags; make sure to preserve any already-set affinity tag. // Affinity is conveyed using regular tags; make sure to preserve any already-set affinity tag.
String currentTagsString = options.remove("tags"); String currentTagsString = options.remove("tags");
Set<String> currentTags = (currentTagsString == null) ? new HashSet<String>() : Set<String> currentTags = (currentTagsString == null) ? new HashSet<String>() :
Sets.newHashSet(Splitter.on(' ').split(currentTagsString)); Sets.newLinkedHashSet(Splitter.on(' ').split(currentTagsString));
Set<String> newTags = Sets.newHashSet(tags); Set<String> newTags = new LinkedHashSet<String>();
if (currentTags.contains(SSD_AFFINITY_TAG)) { for (String tag : tags)
newTags.add(tag);
if (currentTags.contains(SSD_AFFINITY_TAG))
newTags.add(SSD_AFFINITY_TAG); newTags.add(SSD_AFFINITY_TAG);
}
options.put("tags", Joiner.on(' ').join(newTags)); options.put("tags", Joiner.on(' ').join(newTags));
return this; return this;
@ -83,8 +86,8 @@ public class CloneDriveOptions {
public CloneDriveOptions affinity(AffinityType affinity) { public CloneDriveOptions affinity(AffinityType affinity) {
// Affinity is conveyed using regular tags; make sure to avoid multiple affinity tags in the options. // Affinity is conveyed using regular tags; make sure to avoid multiple affinity tags in the options.
String currentTagsString = options.remove("tags"); String currentTagsString = options.remove("tags");
Set<String> tags = (currentTagsString == null) ? new HashSet<String>() : Set<String> tags = (currentTagsString == null) ? new LinkedHashSet<String>() :
Sets.newHashSet(Splitter.on(' ').split(currentTagsString)); Sets.newLinkedHashSet(Splitter.on(' ').split(currentTagsString));
switch (affinity) { switch (affinity) {
// SSD affinity is conveyed as a special tag: "affinity:ssd". // SSD affinity is conveyed as a special tag: "affinity:ssd".
@ -117,7 +120,7 @@ public class CloneDriveOptions {
/** /**
* @see CloneDriveOptions#tags * @see CloneDriveOptions#tags
*/ */
public static CloneDriveOptions tags(Iterable<String> tags) { public static CloneDriveOptions tags(String... tags) {
CloneDriveOptions options = new CloneDriveOptions(); CloneDriveOptions options = new CloneDriveOptions();
return options.tags(tags); return options.tags(tags);
} }