diff options
author | Jon Marius Venstad <jonmv@gmail.com> | 2022-04-08 12:26:45 +0200 |
---|---|---|
committer | Jon Marius Venstad <jonmv@gmail.com> | 2022-04-08 12:26:45 +0200 |
commit | c94ec50b539ff6d0d3273029f1278e8c90274a57 (patch) | |
tree | 7a16a90f3feb9138e1f1bf3f1d676455d5cb9a92 /configserver | |
parent | 06db1231f64976bd5b7b3bf9d851f179ddfaeeaa (diff) |
Use one HostName class (that is not for JSON)
Diffstat (limited to 'configserver')
2 files changed, 4 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index fe9ab82637f..e528078ac96 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -21,7 +21,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.DockerImage; -import com.yahoo.config.provision.HostName; +import com.yahoo.net.HostName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.secretstore.SecretStore; @@ -398,7 +398,7 @@ public class ModelContextImpl implements ModelContext { this.applicationId = applicationId; this.multitenant = configserverConfig.multitenant() || configserverConfig.hostedVespa() || Boolean.getBoolean("multitenant"); this.configServerSpecs = fromConfig(configserverConfig); - this.loadBalancerName = HostName.from(configserverConfig.loadBalancerAddress()); + this.loadBalancerName = HostName.of(configserverConfig.loadBalancerAddress()); this.ztsUrl = configserverConfig.ztsUrl() != null ? URI.create(configserverConfig.ztsUrl()) : null; this.athenzDnsSuffix = configserverConfig.athenzDnsSuffix(); this.hostedVespa = configserverConfig.hostedVespa(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java index 30d3dcffc30..c0392f12e8a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java @@ -5,7 +5,7 @@ import com.yahoo.cloud.config.LbServicesConfig; import com.yahoo.cloud.config.SentinelConfig; import com.yahoo.config.FileReference; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.HostName; +import com.yahoo.net.HostName; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.security.NodeIdentifier; import com.yahoo.config.provision.security.NodeIdentifierException; @@ -56,7 +56,7 @@ public class MultiTenantRpcAuthorizerTest { private static final List<X509Certificate> PEER_CERTIFICATE_CHAIN = List.of(createDummyCertificate()); private static final ApplicationId APPLICATION_ID = ApplicationId.from("mytenant", "myapplication", "default"); private static final ApplicationId EVIL_APP_ID = ApplicationId.from("malice", "malice-app", "default"); - private static final HostName HOSTNAME = HostName.from("myhostname"); + private static final HostName HOSTNAME = HostName.of("myhostname"); private static final FileReference FILE_REFERENCE = new FileReference("myfilereference"); @SuppressWarnings("deprecation") |