aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/config/model
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-11-14 21:31:20 +0100
committerGitHub <noreply@github.com>2017-11-14 21:31:20 +0100
commit526a2bf8da6a0d81cde6de09e1564382ee9a87f9 (patch)
tree01546b50b5c83a0502bc68c4471e688f12a579bc /config-model/src/main/java/com/yahoo/config/model
parent1e19225dc03bc3e16803a67c7c31a14e62c3ec5f (diff)
Revert "Treat loadbalancer address as string and pass through"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
index 0b381508fda..942320ecd40 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
@@ -6,6 +6,7 @@ import com.yahoo.config.provision.ApplicationId;
import com.yahoo.config.provision.Version;
import com.yahoo.config.provision.Zone;
+import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@@ -20,7 +21,7 @@ public class DeployProperties {
private final boolean multitenant;
private final ApplicationId applicationId;
private final List<ConfigServerSpec> serverSpecs = new ArrayList<>();
- private final String loadBalancerAddress;
+ private final URI loadBalancerAddress;
private final boolean hostedVespa;
private final Version vespaVersion;
private final Zone zone;
@@ -28,7 +29,7 @@ public class DeployProperties {
private DeployProperties(boolean multitenant,
ApplicationId applicationId,
List<ConfigServerSpec> configServerSpecs,
- String loadBalancerAddress,
+ URI loadBalancerAddress,
boolean hostedVespa,
Version vespaVersion,
Zone zone) {
@@ -54,7 +55,7 @@ public class DeployProperties {
return serverSpecs;
}
- public String loadBalancerAddress() {
+ public URI loadBalancerAddress() {
return loadBalancerAddress;
}
@@ -74,7 +75,7 @@ public class DeployProperties {
private ApplicationId applicationId = ApplicationId.defaultId();
private boolean multitenant = false;
private List<ConfigServerSpec> configServerSpecs = new ArrayList<>();
- private String loadBalancerAddress;
+ private URI loadBalancerAddress;
private boolean hostedVespa = false;
private Version vespaVersion = Version.fromIntValues(1, 0, 0);
private Zone zone = Zone.defaultZone();
@@ -94,7 +95,7 @@ public class DeployProperties {
return this;
}
- public Builder loadBalancerAddress(String loadBalancerAddress) {
+ public Builder loadBalancerAddress(URI loadBalancerAddress) {
this.loadBalancerAddress = loadBalancerAddress;
return this;
}