From 2430b74a942659d549771cb4dd8b81d77692d905 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Thu, 31 Mar 2022 11:52:40 +0200 Subject: Rename back to HostName, and merge the value class and utilities --- .../yahoo/vespa/config/server/filedistribution/FileDBRegistry.java | 4 ++-- .../vespa/config/server/filedistribution/FileDistributionUtil.java | 4 ++-- .../java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java | 4 ++-- .../java/com/yahoo/vespa/config/server/session/SessionPreparer.java | 4 ++-- .../yahoo/vespa/config/server/filedistribution/FileServerTest.java | 4 ++-- .../src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java index 7040cd5e8a3..3eeaa6598d3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.config.server.filedistribution; import com.google.common.collect.ImmutableMap; import com.yahoo.config.FileReference; import com.yahoo.config.application.api.FileRegistry; -import com.yahoo.net.Hostnames; +import com.yahoo.net.HostName; import com.yahoo.text.Utf8; import net.jpountz.xxhash.XXHashFactory; @@ -130,7 +130,7 @@ public class FileDBRegistry implements FileRegistry { List entries = registry.export(); StringBuilder builder = new StringBuilder(); - builder.append(Hostnames.getLocalhost()).append('\n'); + builder.append(HostName.getLocalhost()).append('\n'); for (FileRegistry.Entry entry : entries) { builder.append(entry.relativePath).append(entryDelimiter).append(entry.reference.value()).append('\n'); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java index cbaa87c36ac..a1ddad7bfd4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.config.server.filedistribution; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.FileReference; -import com.yahoo.net.Hostnames; +import com.yahoo.net.HostName; import com.yahoo.vespa.config.server.ConfigServerSpec; import java.io.File; @@ -35,7 +35,7 @@ public class FileDistributionUtil { public static List getOtherConfigServersInCluster(ConfigserverConfig configserverConfig) { return ConfigServerSpec.fromConfig(configserverConfig) .stream() - .filter(spec -> !spec.getHostName().equals(Hostnames.getLocalhost())) + .filter(spec -> !spec.getHostName().equals(HostName.getLocalhost())) .map(spec -> "tcp/" + spec.getHostName() + ":" + spec.getConfigServerPort()) .collect(Collectors.toList()); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java index f63035cdd6e..55645d83b3c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java @@ -7,7 +7,7 @@ import com.yahoo.component.Version; import com.yahoo.config.provision.TenantName; import com.yahoo.vespa.config.PayloadChecksums; import com.yahoo.jrt.Request; -import com.yahoo.net.Hostnames; +import com.yahoo.net.HostName; import com.yahoo.vespa.config.ConfigPayload; import com.yahoo.vespa.config.ErrorCode; import com.yahoo.vespa.config.UnknownConfigIdException; @@ -32,7 +32,7 @@ import static com.yahoo.vespa.config.protocol.SlimeConfigResponse.fromConfigPayl class GetConfigProcessor implements Runnable { private static final Logger log = Logger.getLogger(GetConfigProcessor.class.getName()); - private static final String localHostName = Hostnames.getLocalhost(); + private static final String localHostName = HostName.getLocalhost(); private final JRTServerConfigRequest request; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index 18dbdaccfe7..8293871335d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -24,7 +24,7 @@ import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.secretstore.SecretStore; import com.yahoo.lang.SettableOptional; -import com.yahoo.net.Hostnames; +import com.yahoo.net.HostName; import com.yahoo.path.Path; import com.yahoo.vespa.config.server.TimeoutBudget; import com.yahoo.vespa.config.server.application.ApplicationSet; @@ -236,7 +236,7 @@ public class SessionPreparer { applicationId + " (" + fileReference + ")"); properties.configServerSpecs() .stream() - .filter(spec -> !spec.getHostName().equals(Hostnames.getLocalhost())) + .filter(spec -> !spec.getHostName().equals(HostName.getLocalhost())) .forEach(spec -> fileDistribution.startDownload(spec.getHostName(), spec.getConfigServerPort(), Set.of(fileReference))); checkTimeout("startDistributionOfApplicationPackage"); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java index 2b6307f85b0..67c40f94b6a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java @@ -6,7 +6,7 @@ import com.yahoo.config.FileReference; import com.yahoo.io.IOUtils; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Transport; -import com.yahoo.net.Hostnames; +import com.yahoo.net.HostName; import com.yahoo.vespa.filedistribution.FileDownloader; import com.yahoo.vespa.filedistribution.FileReferenceData; import com.yahoo.vespa.filedistribution.FileReferenceDownload; @@ -91,7 +91,7 @@ public class FileServerTest { // Empty connection pool when only one server, no use in downloading from yourself List servers = new ArrayList<>(); ConfigserverConfig.Zookeeperserver.Builder serverBuilder = new ConfigserverConfig.Zookeeperserver.Builder(); - serverBuilder.hostname(Hostnames.getLocalhost()); + serverBuilder.hostname(HostName.getLocalhost()); serverBuilder.port(123456); servers.add(serverBuilder); builder.zookeeperserver(servers); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java index 198c646f6a7..40ed20b7969 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java @@ -10,7 +10,7 @@ import com.yahoo.jrt.Request; import com.yahoo.jrt.Spec; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Transport; -import com.yahoo.net.Hostnames; +import com.yahoo.net.HostName; import com.yahoo.test.ManualClock; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.config.server.MemoryGenerationCounter; @@ -50,7 +50,7 @@ import static org.junit.Assert.assertTrue; public class RpcTester implements AutoCloseable { private final ManualClock clock = new ManualClock(Instant.ofEpochMilli(100)); - private final String myHostname = Hostnames.getLocalhost(); + private final String myHostname = HostName.getLocalhost(); private final HostLivenessTracker hostLivenessTracker = new ConfigRequestHostLivenessTracker(clock); private final Spec spec; -- cgit v1.2.3