diff options
author | jonmv <venstad@gmail.com> | 2022-04-08 22:26:30 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-04-08 22:26:30 +0200 |
commit | c5c330f63efb47dad355860db70bf3a89a737970 (patch) | |
tree | 9fe2b047efa6db079df6a8ff5a23e8fd6e8d84a4 /controller-server | |
parent | 80b96d32550ae0df59572a58cd62f507e8068c2c (diff) |
Revert "Merge pull request #22070 from vespa-engine/jonmv/unify-hostname-classes"
This reverts commit 80b96d32550ae0df59572a58cd62f507e8068c2c, reversing
changes made to c391dd7876516ec296430723ad4f1969dd988003.
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java index 72c16ae0110..94af6606ba2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.persistence; -import ai.vespa.http.DomainName; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; +import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Cursor; @@ -83,7 +83,7 @@ public class RoutingPolicySerializer { ClusterSpec.Id.from(inspect.field(clusterField).asString()), ZoneId.from(inspect.field(zoneField).asString())); policies.add(new RoutingPolicy(id, - DomainName.of(inspect.field(canonicalNameField).asString()), + HostName.of(inspect.field(canonicalNameField).asString()), SlimeUtils.optionalString(inspect.field(dnsZoneField)), instanceEndpoints, applicationEndpoints, |