Fix dnsSearch type - dnsSearch declared as String, corrected to List<String>
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/8ca3a326 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8ca3a326 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8ca3a326 Branch: refs/heads/master Commit: 8ca3a326c85b817d31749c7933366a0dfe1e53a6 Parents: f6ad2cc Author: googlielmo <[email protected]> Authored: Mon Oct 5 10:10:20 2015 +0200 Committer: Andrea Turli <[email protected]> Committed: Mon Oct 5 12:36:43 2015 +0200 ---------------------------------------------------------------------- .../main/java/org/jclouds/docker/domain/HostConfig.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/8ca3a326/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java ---------------------------------------------------------------------- diff --git a/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java b/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java index 17a4f38..1e655af 100644 --- a/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java +++ b/apis/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java @@ -41,7 +41,7 @@ public abstract class HostConfig { public abstract List<String> dns(); - @Nullable public abstract String dnsSearch(); + @Nullable public abstract List<String> dnsSearch(); public abstract Map<String, List<Map<String, String>>> portBindings(); @@ -62,9 +62,9 @@ public abstract class HostConfig { @SerializedNames({ "ContainerIDFile", "Binds", "LxcConf", "Privileged", "Dns", "DnsSearch", "PortBindings", "Links", "ExtraHosts", "PublishAllPorts", "VolumesFrom", "NetworkMode" }) public static HostConfig create(String containerIDFile, List<String> binds, List<Map<String, String>> lxcConf, - boolean privileged, List<String> dns, String dnsSearch, Map<String, List<Map<String, String>>> portBindings, + boolean privileged, List<String> dns, List<String> dnsSearch, Map<String, List<Map<String, String>>> portBindings, List<String> links, List<String> extraHosts, boolean publishAllPorts, List<String> volumesFrom, String networkMode) { - return new AutoValue_HostConfig(containerIDFile, copyOf(binds), copyOf(lxcConf), privileged, copyOf(dns), dnsSearch, + return new AutoValue_HostConfig(containerIDFile, copyOf(binds), copyOf(lxcConf), privileged, copyOf(dns), copyOf(dnsSearch), copyOf(portBindings), copyOf(links), copyOf(extraHosts), publishAllPorts, copyOf(volumesFrom), networkMode); } @@ -83,7 +83,7 @@ public abstract class HostConfig { private List<Map<String, String>> lxcConf = Lists.newArrayList(); private boolean privileged; private List<String> dns = Lists.newArrayList(); - private String dnsSearch; + private List<String> dnsSearch = Lists.newArrayList(); private Map<String, List<Map<String, String>>> portBindings = Maps.newLinkedHashMap(); private List<String> links = Lists.newArrayList(); private List<String> extraHosts = Lists.newArrayList(); @@ -116,8 +116,8 @@ public abstract class HostConfig { return this; } - public Builder dnsSearch(String dnsSearch) { - this.dnsSearch = dnsSearch; + public Builder dnsSearch(List<String> dnsSearch) { + this.dnsSearch.addAll(checkNotNull(dnsSearch, "dnsSearch")); return this; }
