diff options
51 files changed, 71 insertions, 179 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index c11d7b12a66..b437e961104 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -19,7 +19,6 @@ import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; -import com.yahoo.container.handler.metrics.JsonResponse; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.docproc.jdisc.metric.NullMetric; import com.yahoo.io.IOUtils; @@ -209,10 +208,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye this.metric = metric; } - public Clock clock() { - return clock; - } - public Metric metric() { return metric; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java index 6c9b7216e59..ef7d8756228 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java @@ -1,9 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server; -import com.yahoo.vespa.config.protocol.Trace; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.TenantName; +import com.yahoo.vespa.config.protocol.Trace; import com.yahoo.vespa.config.server.tenant.TenantRepository; /** @@ -23,10 +22,6 @@ public class GetConfigContext { this.trace = trace; } - public TenantName tenant() { - return app.tenant(); - } - public ApplicationId applicationId() { return app; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java index ac862dd6e5f..4e6fa590749 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java @@ -89,10 +89,6 @@ public class SuperModelManager implements SuperModelProvider { } } - public Zone getZone() { - return zone; - } - public void configActivated(ApplicationSet applicationSet) { synchronized (monitor) { // TODO: Should supermodel care about multiple versions? diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/HttpProxy.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/HttpProxy.java index 8c53a9bc9d5..703215e2ec7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/HttpProxy.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/HttpProxy.java @@ -20,7 +20,7 @@ import java.util.stream.Stream; public class HttpProxy { - private static Logger logger = Logger.getLogger(HttpProxy.class.getName()); + private static final Logger logger = Logger.getLogger(HttpProxy.class.getName()); private final HttpFetcher fetcher; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java index ba3b6f71b4b..d87a37829de 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java @@ -415,10 +415,6 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica return this; } - public HostRegistry<ApplicationId> getApplicationHostRegistry() { - return hostRegistry; - } - public ApplicationId getApplicationIdForHostName(String hostname) { return hostRegistry.getKeyForHost(hostname); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index 6e571fec72b..01a95e8ecdd 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -54,7 +54,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { private final DeployLogger logger = new SilentDeployLogger(); /** The repository part of docker image this application should run on. Version is separate from image repo */ - Optional<DockerImage> dockerImageRepository; + final Optional<DockerImage> dockerImageRepository; /** The Vespa version this application should run on */ private final Version version; @@ -68,7 +68,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { private boolean prepared = false; /** Whether this model should be validated (only takes effect if prepared=false) */ - private boolean validate; + private final boolean validate; private boolean ignoreSessionStaleFailure = false; 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 d26f6c6da04..815cc0a3a18 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 @@ -213,7 +213,7 @@ public class ModelContextImpl implements ModelContext { skipMbusRequestThread = Flags.SKIP_MBUS_REQUEST_THREAD.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); skipMbusReplyThread = Flags.SKIP_MBUS_REPLY_THREAD.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();; + .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.athenzDomain = athenzDomain; this.applicationRoles = applicationRoles; feedCoreThreadPoolSizeFactor = Flags.FEED_CORE_THREAD_POOL_SIZE_FACTOR.bindTo(flagSource) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java index 33914face61..ff70ce1e1b2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java @@ -150,7 +150,7 @@ public class HttpConfigRequest implements GetConfigRequest, TenantRequest { * @return ok or not */ private static boolean configNameNotFound(final ConfigKey<?> requestKey, Set<ConfigKey<?>> allConfigsProduced) { - return !Iterables.any(allConfigsProduced, new Predicate<ConfigKey<?>>() { + return !Iterables.any(allConfigsProduced, new Predicate<>() { @Override public boolean apply(ConfigKey<?> k) { return k.getName().equals(requestKey.getName()) && k.getNamespace().equals(requestKey.getNamespace()); @@ -175,7 +175,7 @@ public class HttpConfigRequest implements GetConfigRequest, TenantRequest { @Override public DefContent getDefContent() { - return DefContent.fromList(Collections.<String>emptyList()); + return DefContent.fromList(Collections.emptyList()); } @Override diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java index cdf995b80bb..b06d5c31ac6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java @@ -43,7 +43,7 @@ public class ListApplicationsHandler extends HttpHandler { String urlBase = Utils.getUrlBase(request, "/application/v2/tenant/" + tenantName + "/application/"); List<ApplicationId> applicationIds = listApplicationIds(tenantName); - Collection<String> applicationUrls = Collections2.transform(applicationIds, new Function<ApplicationId, String>() { + Collection<String> applicationUrls = Collections2.transform(applicationIds, new Function<>() { @Override public String apply(ApplicationId id) { return createUrlStringFromId(urlBase, id, zone); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java index e859bdadd28..c5c346bfa01 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java @@ -10,9 +10,6 @@ import java.net.URI; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; import java.util.logging.Logger; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsSlime.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsSlime.java index 617767bc6a7..f16ba03d122 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsSlime.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/MetricsSlime.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.config.server.metrics; import com.yahoo.slime.Inspector; import com.yahoo.slime.Slime; import com.yahoo.slime.SlimeUtils; -import com.yahoo.yolean.Exceptions; + import java.io.IOException; import java.io.InputStream; import java.net.URI; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java index 6366576e163..ae258445e88 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java @@ -81,7 +81,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer { serviceInfo.getServiceType().equals(QRSERVER.serviceName)). findAny(); if (container.isPresent()) { - activeRotation |= Boolean.valueOf(container.get().getProperty("activeRotation").orElse("false")); + activeRotation |= Boolean.parseBoolean(container.get().getProperty("activeRotation").orElse("false")); } } return activeRotation; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java index 8b9580c9688..e3516535b46 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/Metrics.java @@ -96,10 +96,6 @@ public class Metrics extends AbstractComponent implements MetricUpdaterFactory, metric.set(METRIC_LATENCY, increment, metricContext); } - public long getRequests() { - return requests.get(); - } - public Metric getMetric() { return metric; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java index 0d8b964a6d3..7ab55b9af72 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java @@ -38,7 +38,7 @@ public class DelayedConfigResponses { private final ScheduledExecutorService executorService; private final boolean useJrtWatcher; - private Map<ApplicationId, MetricUpdater> metrics = new ConcurrentHashMap<>(); + private final Map<ApplicationId, MetricUpdater> metrics = new ConcurrentHashMap<>(); /* Requests that resolve to config that has not changed are put on this queue. When reloading config, all requests on this queue are reprocessed as if they were a new request */ diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java index 2ebfd6a11d3..a96ae16a20b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java @@ -460,7 +460,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener { } static class ChunkedFileReceiver implements FileServer.Receiver { - Target target; + final Target target; ChunkedFileReceiver(Target target) { this.target = target; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java index 4ffce8a697e..6ec0ba693f5 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java @@ -66,7 +66,7 @@ public class ContainerEndpointSerializer { public static void endpointToSlime(Cursor cursor, ContainerEndpoint endpoint) { - cursor.setString(clusterIdField, endpoint.clusterId().toString()); + cursor.setString(clusterIdField, endpoint.clusterId()); final var namesInspector = cursor.setArray(namesField); endpoint.names().forEach(namesInspector::addString); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantDebugger.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantDebugger.java index b249211081f..d378f6e9235 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantDebugger.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantDebugger.java @@ -17,11 +17,10 @@ import java.util.logging.Logger; */ public class TenantDebugger implements TreeCacheListener { - private final TreeCache cache; private static final Logger log = Logger.getLogger(TenantDebugger.class.getName()); public TenantDebugger(Curator curator) throws Exception { - cache = new TreeCache(curator.framework(), "/config/v2/tenants"); + TreeCache cache = new TreeCache(curator.framework(), "/config/v2/tenants"); cache.getListenable().addListener(this); cache.start(); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFile.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFile.java index 34cf6e345a0..e598a73ebfb 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFile.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFile.java @@ -33,9 +33,7 @@ class ZKApplicationFile extends ApplicationFile { String zkPath = getZKPath(path); if (zkApp.exists(zkPath)) { String data = zkApp.getData(zkPath); - if (data == null || data.isEmpty() || !zkApp.getChildren(zkPath).isEmpty()) { - return true; - } + return data == null || data.isEmpty() || ! zkApp.getChildren(zkPath).isEmpty(); } return false; } diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java index d7005de5b07..800dca6bc73 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java @@ -63,10 +63,7 @@ public final class Cluster implements Comparable<Cluster> { if (!name.equals(other.name)) { return false; } - if (!type.equals(other.type)) { - return false; - } - return true; + return type.equals(other.type); } @Override diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java index 16a65b965e2..df1db4f8101 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java @@ -157,10 +157,7 @@ public final class Service implements Comparable<Service> { if (!serviceType.equals(other.serviceType)) { return false; } - if (statePort != other.statePort) { - return false; - } - return true; + return statePort == other.statePort; } } diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java index a155090b79c..78811474bcb 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java @@ -212,7 +212,7 @@ public final class ServiceModel { * if no matching service is found */ public Service resolve(String host, int port, Service self) { - Integer portAsObject = Integer.valueOf(port); + Integer portAsObject = port; String realHost; if ("localhost".equals(host)) { realHost = self.host; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/MockSecretStore.java b/configserver/src/test/java/com/yahoo/vespa/config/server/MockSecretStore.java index 12f48778144..35177ca9c1b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/MockSecretStore.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/MockSecretStore.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; public class MockSecretStore implements SecretStore { - Map<String, Map<Integer, String>> secrets = new HashMap<>(); + final Map<String, Map<Integer, String>> secrets = new HashMap<>(); @Override public String getSecret(String key) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ServerCacheTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ServerCacheTest.java index 9a18570db2d..35449238f78 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ServerCacheTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ServerCacheTest.java @@ -22,22 +22,22 @@ import static org.junit.Assert.assertTrue; public class ServerCacheTest { private ServerCache cache; - private static String defMd5 = "595f44fec1e92a71d3e9e77456ba80d1"; - private static String defMd5_2 = "a2f8edfc965802bf6d44826f9da7e2b0"; - private static String configMd5 = "mymd5"; - private static String configMd5_2 = "mymd5_2"; - private static ConfigDefinition def = new ConfigDefinition("mypayload", new String[0]); + private static final String defMd5 = "595f44fec1e92a71d3e9e77456ba80d1"; + private static final String defMd5_2 = "a2f8edfc965802bf6d44826f9da7e2b0"; + private static final String configMd5 = "mymd5"; + private static final String configMd5_2 = "mymd5_2"; + private static final ConfigDefinition def = new ConfigDefinition("mypayload", new String[0]); - private static ConfigDefinitionKey fooBarDefKey = new ConfigDefinitionKey("foo", "bar"); - private static ConfigDefinitionKey fooBazDefKey = new ConfigDefinitionKey("foo", "baz"); - private static ConfigDefinitionKey fooBimDefKey = new ConfigDefinitionKey("foo", "bim"); + private static final ConfigDefinitionKey fooBarDefKey = new ConfigDefinitionKey("foo", "bar"); + private static final ConfigDefinitionKey fooBazDefKey = new ConfigDefinitionKey("foo", "baz"); + private static final ConfigDefinitionKey fooBimDefKey = new ConfigDefinitionKey("foo", "bim"); - private static ConfigKey<?> fooConfigKey = new ConfigKey<>("foo", "id", "bar"); - private static ConfigKey<?> bazConfigKey = new ConfigKey<>("foo", "id2", "bar"); + private static final ConfigKey<?> fooConfigKey = new ConfigKey<>("foo", "id", "bar"); + private static final ConfigKey<?> bazConfigKey = new ConfigKey<>("foo", "id2", "bar"); - private ConfigCacheKey fooBarCacheKey = new ConfigCacheKey(fooConfigKey, defMd5); - private ConfigCacheKey bazQuuxCacheKey = new ConfigCacheKey(bazConfigKey, defMd5); - private ConfigCacheKey fooBarCacheKeyDifferentMd5 = new ConfigCacheKey(fooConfigKey, defMd5_2); + private final ConfigCacheKey fooBarCacheKey = new ConfigCacheKey(fooConfigKey, defMd5); + private final ConfigCacheKey bazQuuxCacheKey = new ConfigCacheKey(bazConfigKey, defMd5); + private final ConfigCacheKey fooBarCacheKeyDifferentMd5 = new ConfigCacheKey(fooConfigKey, defMd5_2); @Before public void setup() { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java index 68dd5396cf1..e6652c3c5e1 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java @@ -110,10 +110,10 @@ public class TestComponentRegistry implements GlobalComponentRegistry { .sessionLifetime(5)); private ConfigDefinitionRepo defRepo = new StaticConfigDefinitionRepo(); private ReloadListener reloadListener = new TenantApplicationsTest.MockReloadListener(); - private MockTenantListener tenantListener = new MockTenantListener(); + private final MockTenantListener tenantListener = new MockTenantListener(); private Optional<PermanentApplicationPackage> permanentApplicationPackage = Optional.empty(); - private HostRegistries hostRegistries = new HostRegistries(); - private Optional<FileDistributionFactory> fileDistributionFactory = Optional.empty(); + private final HostRegistries hostRegistries = new HostRegistries(); + private final Optional<FileDistributionFactory> fileDistributionFactory = Optional.empty(); private ModelFactoryRegistry modelFactoryRegistry = new ModelFactoryRegistry(Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry()))); private Optional<Provisioner> hostProvisioner = Optional.empty(); private Zone zone = Zone.defaultZone(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java index a562f89c7ec..4a55d013584 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java @@ -21,8 +21,8 @@ public class ApplicationMapperTest { private ApplicationId appId; private ApplicationMapper applicationMapper; - private ArrayList<Version> vespaVersions = new ArrayList<>(); - private ArrayList<Application> applications = new ArrayList<>(); + private final ArrayList<Version> vespaVersions = new ArrayList<>(); + private final ArrayList<Application> applications = new ArrayList<>(); @Before public void setUp() { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java index f5d661e265a..a5ec2583595 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Optional; -import java.util.Set; import com.yahoo.config.provision.ApplicationId; import com.yahoo.component.Version; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java index ad910c2afc2..1e70304ef42 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java @@ -126,7 +126,7 @@ public class ApplicationTest { public void require_that_non_existent_fields_in_schema_is_skipped() throws IOException { // Ask for config without schema and check that we get correct default value back ByteArrayOutputStream baos = new ByteArrayOutputStream(); - handler.resolveConfig(createSimpleConfigRequest()).serialize(baos, CompressionType.UNCOMPRESSED);; + handler.resolveConfig(createSimpleConfigRequest()).serialize(baos, CompressionType.UNCOMPRESSED); assertEquals("{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}", baos.toString(StandardCharsets.UTF_8)); // Ask for config with wrong schema String[] schema = new String[1]; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/FileDistributionStatusTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/FileDistributionStatusTest.java index 89392d799ba..e425943ef59 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/FileDistributionStatusTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/FileDistributionStatusTest.java @@ -37,8 +37,8 @@ public class FileDistributionStatusTest { private final Duration timeout = Duration.ofMillis(100); - private TenantName tenant = TenantName.from("mytenant"); - private ApplicationId appId = ApplicationId.from(tenant, ApplicationName.from("myapp"), InstanceName.from("myinstance")); + private final TenantName tenant = TenantName.from("mytenant"); + private final ApplicationId appId = ApplicationId.from(tenant, ApplicationName.from("myapp"), InstanceName.from("myinstance")); private Application application; @Rule diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java index 969040174dd..05f7aade168 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java @@ -53,7 +53,7 @@ public class TenantApplicationsTest { private static final TenantName tenantName = TenantName.from("tenant"); private static final Version vespaVersion = new VespaModelFactory(new NullConfigModelRegistry()).version(); - private MockReloadListener listener = new MockReloadListener(); + private final MockReloadListener listener = new MockReloadListener(); private CuratorFramework curatorFramework; private TestComponentRegistry componentRegistry; private TenantApplications applications; @@ -141,9 +141,9 @@ public class TenantApplicationsTest { } public static class MockReloadListener implements ReloadListener { - public AtomicInteger reloaded = new AtomicInteger(0); - AtomicInteger removed = new AtomicInteger(0); - Map<String, Collection<String>> tenantHosts = new LinkedHashMap<>(); + public final AtomicInteger reloaded = new AtomicInteger(0); + final AtomicInteger removed = new AtomicInteger(0); + final Map<String, Collection<String>> tenantHosts = new LinkedHashMap<>(); @Override public void configActivated(ApplicationSet application) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java index 7a8bad3d199..a574d8f3b60 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java @@ -85,14 +85,6 @@ public class DeployTester { Clock.systemUTC()); } - public DeployTester(ConfigserverConfig configserverConfig) { - this(Collections.singletonList(createModelFactory(Clock.systemUTC())), configserverConfig, Clock.systemUTC()); - } - - public DeployTester(ConfigserverConfig configserverConfig, HostProvisioner provisioner) { - this(Collections.singletonList(createModelFactory(Clock.systemUTC())), configserverConfig, Clock.systemUTC(), provisioner); - } - public DeployTester(ConfigserverConfig configserverConfig, Clock clock) { this(Collections.singletonList(createModelFactory(clock)), configserverConfig, clock); } @@ -163,11 +155,6 @@ public class DeployTester { return createModelFactory(version, clock, Zone.defaultZone()); } - /** Create a model factory for a particular version and zone */ - public static CountingModelFactory createModelFactory(Version version, Zone zone) { - return new CountingModelFactory(version, Clock.systemUTC(), zone); - } - /** Create a model factory for a particular version, clock and zone */ public static CountingModelFactory createModelFactory(Version version, Clock clock, Zone zone) { return new CountingModelFactory(version, clock, zone); @@ -218,18 +205,6 @@ public class DeployTester { return deployApp(applicationPath, vespaVersion, Instant.now()); } - - /** - * Do the initial "deploy" with the existing API-less code as the deploy API doesn't support first deploys yet. - */ - public PrepareResult deployApp(String applicationPath, String vespaVersion, String dockerImageRepository) { - PrepareParams.Builder paramsBuilder = new PrepareParams.Builder(); - if (vespaVersion != null) - paramsBuilder.vespaVersion(vespaVersion); - - return deployApp(applicationPath, Instant.now(), paramsBuilder.dockerImageRepository(dockerImageRepository)); - } - /** * Do the initial "deploy" with the existing API-less code as the deploy API doesn't support first deploys yet. */ diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java index 5105f1b0d5f..dfc5649433a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java @@ -47,7 +47,7 @@ public class ZooKeeperClientTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); private ConfigCurator zk; - private String appPath = "/1"; + private final String appPath = "/1"; @Before public void setupZK() throws IOException { 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 43f5d135e45..2facca99f60 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 @@ -100,7 +100,7 @@ public class FileServerTest { } private static class FileReceiver implements FileServer.Receiver { - CompletableFuture<byte []> content; + final CompletableFuture<byte []> content; FileReceiver(CompletableFuture<byte []> content) { this.content = content; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionProvider.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionProvider.java index 45e00e2ece8..70b03fcdd36 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionProvider.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileDistributionProvider.java @@ -1,8 +1,6 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.filedistribution; -import com.yahoo.config.model.api.FileDistribution; - import java.io.File; /** @@ -15,8 +13,4 @@ public class MockFileDistributionProvider extends FileDistributionProvider { new MockFileDistribution(fileReferencesDir)); } - public FileDistribution getFileDistribution() { - return super.getFileDistribution(); - } - } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileRegistry.java index 343e0c50520..890a31645fd 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileRegistry.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/MockFileRegistry.java @@ -7,7 +7,6 @@ import com.yahoo.net.HostName; import java.io.File; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java index e2bd8a120e0..d614031c443 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java @@ -45,7 +45,7 @@ public class HttpHandlerTest { } private static class HttpTestHandler extends HttpHandler { - private RuntimeException exception; + private final RuntimeException exception; HttpTestHandler(RuntimeException exception) { super(HttpHandler.testOnlyContext()); this.exception = exception; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java index bd306880039..9d696ae34e7 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java @@ -55,10 +55,6 @@ public class SessionHandlerTest { return createTestRequest(path, method, cmd, id, ""); } - public static HttpRequest createTestRequest(String path, com.yahoo.jdisc.http.HttpRequest.Method method) { - return HttpRequest.createTestRequest("http://" + hostname + ":" + port + path, method); - } - public static HttpRequest createTestRequest(String path) { return HttpRequest.createTestRequest("http://" + hostname + ":" + port + path, com.yahoo.jdisc.http.HttpRequest.Method.PUT); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java index edfe74ef3f9..53422df3fad 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java @@ -15,7 +15,6 @@ import com.yahoo.vespa.config.server.TimeoutBudget; import com.yahoo.vespa.config.server.application.OrchestratorMock; import com.yahoo.vespa.config.server.http.HandlerTest; import com.yahoo.vespa.config.server.http.HttpErrorResponse; -import com.yahoo.vespa.config.server.http.SessionHandler; import com.yahoo.vespa.config.server.http.SessionHandlerTest; import com.yahoo.vespa.config.server.model.TestModelFactory; import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry; @@ -112,14 +111,12 @@ public class SessionActiveHandlerTest { private long sessionId; private HttpResponse actResponse; private ApplicationMetaData metaData; - private String subPath; + private final String subPath; ActivateRequest(String subPath) { this.subPath = subPath; } - public SessionHandler getHandler() { return handler; } - HttpResponse getActResponse() { return actResponse; } public long getSessionId() { return sessionId; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java index 5c0b1764e70..d2f09b802da 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java @@ -55,8 +55,6 @@ public class SessionCreateHandlerTest extends SessionHandlerTest { private String createdMessage = " created.\""; private String tenantMessage = ""; - public File testApp = new File("src/test/apps/app"); - static { postHeaders.put(ApplicationApiHandler.contentTypeHeader, ApplicationApiHandler.APPLICATION_X_GZIP); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java index 535118ae5aa..b78d8d3e525 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java @@ -53,7 +53,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { private static final TenantName tenant = TenantName.from("test"); private static final File app = new File("src/test/resources/deploy/validapp"); - private Curator curator = new MockCurator(); + private final Curator curator = new MockCurator(); private final TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder().curator(curator).build(); private final Clock clock = componentRegistry.getClock(); private final TimeoutBudget timeoutBudget = new TimeoutBudget(clock, Duration.ofSeconds(10)); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java index 27934da683d..8df0e066cf4 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java @@ -88,7 +88,7 @@ public class ClusterDeploymentMetricsRetrieverTest { private static final double metricsTolerance = 0.001; private void compareAggregators(DeploymentMetricsAggregator expected, DeploymentMetricsAggregator actual) { - BiConsumer<Double, Double> assertDoubles = (a, b) -> assertEquals(a.doubleValue(), b.doubleValue(), metricsTolerance); + BiConsumer<Double, Double> assertDoubles = (a, b) -> assertEquals(a, b, metricsTolerance); compareOptionals(expected.aggregateDocumentCount(), actual.aggregateDocumentCount(), assertDoubles); compareOptionals(expected.aggregateQueryRate(), actual.aggregateQueryRate(), assertDoubles); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java index 211a14acd76..3c53d85c56e 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java index 0bafb3de168..a0025d086f5 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java @@ -57,7 +57,7 @@ public class DeploymentMetricsRetrieverTest { return List.of(hostInfo1, hostInfo2, hostInfo3); } - class MockDeploymentMetricsRetriever extends ClusterDeploymentMetricsRetriever { + static class MockDeploymentMetricsRetriever extends ClusterDeploymentMetricsRetriever { Collection<URI> hosts = new ArrayList<>(); @@ -74,9 +74,9 @@ public class DeploymentMetricsRetrieverTest { } } - class MockModel implements Model { + static class MockModel implements Model { - Collection<HostInfo> hosts; + final Collection<HostInfo> hosts; MockModel(Collection<HostInfo> hosts) { this.hosts = hosts; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java index e9789578b5e..e97c4dc6682 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java @@ -26,8 +26,8 @@ public class ProtonMetricsRetrieverTest { @Test public void getMetrics() { - ProtonMetricsRetrieverTest.MockModel mockModel = new ProtonMetricsRetrieverTest.MockModel(mockHosts()); - ProtonMetricsRetrieverTest.MockProtonMetricsRetriever mockMetricsRetriever = new ProtonMetricsRetrieverTest.MockProtonMetricsRetriever(); + ProtonMetricsRetrieverTest.MockModel mockModel = new MockModel(mockHosts()); + ProtonMetricsRetrieverTest.MockProtonMetricsRetriever mockMetricsRetriever = new MockProtonMetricsRetriever(); Application application = new Application(mockModel, null, 0, false, null, null, ApplicationId.fromSerializedForm("tenant:app:instance")); @@ -52,7 +52,7 @@ public class ProtonMetricsRetrieverTest { return List.of(hostInfo1, hostInfo2, hostInfo3); } - class MockProtonMetricsRetriever extends ClusterProtonMetricsRetriever { + static class MockProtonMetricsRetriever extends ClusterProtonMetricsRetriever { Collection<URI> hosts = new ArrayList<>(); @@ -67,9 +67,9 @@ public class ProtonMetricsRetrieverTest { } } - class MockModel implements Model { + static class MockModel implements Model { - Collection<HostInfo> hosts; + final Collection<HostInfo> hosts; MockModel(Collection<HostInfo> hosts) { this.hosts = hosts; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java index f75d11a145f..325db1feba6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java @@ -54,7 +54,7 @@ public class LbServicesProducerTest { private static final Set<ContainerEndpoint> endpoints = Set.of( new ContainerEndpoint("mydisc", List.of("rotation-1", "rotation-2")) ); - private InMemoryFlagSource flagSource = new InMemoryFlagSource(); + private final InMemoryFlagSource flagSource = new InMemoryFlagSource(); private final boolean useGlobalServiceId; @Parameterized.Parameters diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java index 6fa4a421d5a..5d8b8c92472 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java @@ -1,18 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.rpc; -import com.yahoo.config.SimpletypesConfig; -import com.yahoo.config.codegen.DefParser; -import com.yahoo.config.codegen.InnerCNode; -import com.yahoo.text.StringUtilities; import com.yahoo.vespa.config.ConfigPayload; import com.yahoo.vespa.config.protocol.CompressionType; import com.yahoo.vespa.config.protocol.ConfigResponse; -import org.junit.Before; import org.junit.Test; -import java.io.StringReader; - import static org.junit.Assert.assertEquals; /** @@ -20,15 +13,6 @@ import static org.junit.Assert.assertEquals; */ public class ConfigResponseFactoryTest { - private InnerCNode def; - - @Before - public void setup() { - DefParser dParser = new DefParser(SimpletypesConfig.getDefName(), - new StringReader(StringUtilities.implode(SimpletypesConfig.CONFIG_DEF_SCHEMA, "\n"))); - def = dParser.getTree(); - } - @Test public void testUncompressedFactory() { UncompressedConfigResponseFactory responseFactory = new UncompressedConfigResponseFactory(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java index 96518d535bf..6ca3f6c67ea 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpcServer.java @@ -25,14 +25,10 @@ import java.util.concurrent.CompletionService; */ public class MockRpcServer extends RpcServer { - public boolean forced = false; - public RuntimeException exception = null; + public final RuntimeException exception = null; public int errorCode = 0; - public ConfigResponse response = null; + public final ConfigResponse response = null; - // Fields used to assert on the calls made to this from tests - public boolean tryResolveConfig = false; - public boolean tryRespond = false; /** The last request received and responded to */ public volatile JRTServerConfigRequest latestRequest = null; @@ -54,37 +50,33 @@ public class MockRpcServer extends RpcServer { return new ConfigserverConfig(b); } - boolean waitUntilSet(Duration timeout) { + void waitUntilSet(Duration timeout) { Instant end = Instant.now().plus(timeout); while (Instant.now().isBefore(end)) { if (latestRequest != null) - return true; + return; try { Thread.sleep(10); } catch (InterruptedException e) { e.printStackTrace(); } } - return false; } @Override public Boolean addToRequestQueue(JRTServerConfigRequest request, boolean forceResponse, CompletionService<Boolean> completionService) { latestRequest = request; - forced = forceResponse; return true; } @Override public void respond(JRTServerConfigRequest request) { latestRequest = request; - tryRespond = true; errorCode = request.errorCode(); } @Override public ConfigResponse resolveConfig(JRTServerConfigRequest request, GetConfigContext context, Optional<Version> vespaVersion) { - tryResolveConfig = true; if (exception != null) { throw exception; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/MockSessionZKClient.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/MockSessionZKClient.java index b0e184398e5..692510b8b6d 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/MockSessionZKClient.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/MockSessionZKClient.java @@ -7,7 +7,6 @@ import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.TenantName; import com.yahoo.vespa.config.server.tenant.TenantRepository; import com.yahoo.vespa.curator.Curator; -import com.yahoo.vespa.curator.mock.MockCurator; import java.util.Optional; @@ -18,7 +17,7 @@ import java.util.Optional; */ public class MockSessionZKClient extends SessionZooKeeperClient { - private ApplicationPackage app; + private final ApplicationPackage app; private Optional<AllocatedHosts> info = Optional.empty(); public MockSessionZKClient(Curator curator, TenantName tenantName, long sessionId) { @@ -36,10 +35,6 @@ public class MockSessionZKClient extends SessionZooKeeperClient { curator.create(TenantRepository.getSessionsPath(tenantName).append(String.valueOf(sessionId))); } - public MockSessionZKClient(ApplicationPackage app) { - this(new MockCurator(), TenantName.defaultName(), 123, app); - } - @Override public ApplicationPackage loadApplicationPackage() { if (app != null) return app; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java index 490e1a4075c..cda3e09d3a8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java @@ -235,7 +235,7 @@ public class RemoteSessionTest { return new RemoteSession(tenantName, sessionId, registryBuilder.build(), zkc); } - private class MockModelFactory implements ModelFactory { + private static class MockModelFactory implements ModelFactory { /** Throw a RuntimeException on load - this is handled gracefully during model building */ boolean throwOnLoad = false; @@ -249,7 +249,7 @@ public class RemoteSessionTest { /** The validation overrides of this, or null if none */ private final String validationOverrides; - private Clock clock = Clock.fixed(LocalDate.parse("2000-01-01", DateTimeFormatter.ISO_DATE).atStartOfDay().atZone(ZoneOffset.UTC).toInstant(), ZoneOffset.UTC); + private final Clock clock = Clock.fixed(LocalDate.parse("2000-01-01", DateTimeFormatter.ISO_DATE).atStartOfDay().atZone(ZoneOffset.UTC).toInstant(), ZoneOffset.UTC); MockModelFactory() { this(null); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java index 7f38083797e..bcd5c9582b2 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java @@ -22,7 +22,6 @@ import java.util.Set; public class SessionTest { public static class MockSessionPreparer extends SessionPreparer { - public boolean isPrepared = false; public MockSessionPreparer() { super(null, null, null, null, null, null, new MockCurator(), null, null, null); @@ -33,7 +32,6 @@ public class SessionTest { Optional<ApplicationSet> currentActiveApplicationSet, Path tenantPath, Instant now, File serverDbSessionDir, ApplicationPackage applicationPackage, SessionZooKeeperClient sessionZooKeeperClient) { - isPrepared = true; return new PrepareResult(AllocatedHosts.withHosts(Set.of()), List.of()); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java index ddaf547e413..a69f1e8f38f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java @@ -25,7 +25,7 @@ public class ContainerEndpointSerializerTest { entryNames.addString("b"); final var endpoint = ContainerEndpointSerializer.endpointFromSlime(slime.get()); - assertEquals("foobar", endpoint.clusterId().toString()); + assertEquals("foobar", endpoint.clusterId()); assertEquals(List.of("a", "b"), endpoint.names()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/EndpointCertificateMetadataStoreTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/EndpointCertificateMetadataStoreTest.java index d71eab25ce3..829e47bdb42 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/EndpointCertificateMetadataStoreTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/EndpointCertificateMetadataStoreTest.java @@ -35,12 +35,12 @@ public class EndpointCertificateMetadataStoreTest { ApplicationName.from("test"), InstanceName.defaultName()); private MockCurator curator; - private MockSecretStore secretStore = new MockSecretStore(); + private final MockSecretStore secretStore = new MockSecretStore(); private EndpointCertificateMetadataStore endpointCertificateMetadataStore; private EndpointCertificateRetriever endpointCertificateRetriever; - private KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256); - private X509Certificate certificate = X509CertificateBuilder.fromKeypair(keyPair, new X500Principal("CN=subject"), - Instant.now(), Instant.now().plus(1, ChronoUnit.DAYS), SignatureAlgorithm.SHA512_WITH_ECDSA, BigInteger.valueOf(12345)).build(); + private final KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256); + private final X509Certificate certificate = X509CertificateBuilder.fromKeypair(keyPair, new X500Principal("CN=subject"), + Instant.now(), Instant.now().plus(1, ChronoUnit.DAYS), SignatureAlgorithm.SHA512_WITH_ECDSA, BigInteger.valueOf(12345)).build(); @Before public void setUp() { |