diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-12 16:57:08 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-13 17:55:02 +0100 |
commit | b6e247f802cb0fabae8bf417b97a630a8d108780 (patch) | |
tree | 4199c3ab1d3e44c26954013de59d014a1739f026 /node-repository | |
parent | 0a4a2b5cbd669954352b79ee0b5e1e5b57d7659e (diff) |
Cleanup
Diffstat (limited to 'node-repository')
4 files changed, 2 insertions, 10 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java index 7dc2aff18dc..18ff2700b21 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java @@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableSet; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.Flavor; -import com.yahoo.config.provision.NetworkPorts; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.hosted.provision.node.Agent; import com.yahoo.vespa.hosted.provision.node.Allocation; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java index 205ffca89b2..52dbac73eb3 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java @@ -40,7 +40,7 @@ public class InfrastructureVersions { throw new IllegalArgumentException("Cannot set version for type " + nodeType); } if (newTargetVersion.isEmpty()) { - throw new IllegalArgumentException("Invalid target version: " + newTargetVersion.toFullString()); + throw new IllegalArgumentException("Invalid target version: " + newTargetVersion.toFullString()); } try (Lock lock = db.lockInfrastructureVersions()) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java index 42dbcdf7a86..8affa21b59c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java @@ -14,7 +14,6 @@ import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.Allocation; import com.yahoo.vespa.hosted.provision.node.History; import com.yahoo.vespa.hosted.provision.provisioning.DockerHostCapacity; -import com.yahoo.vespa.orchestrator.HostNameNotFoundException; import com.yahoo.vespa.orchestrator.Orchestrator; import com.yahoo.vespa.orchestrator.status.HostStatus; import com.yahoo.vespa.service.monitor.ServiceMonitor; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/OsVersionsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/OsVersionsTest.java index 36c9591f85a..132d0d3c772 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/OsVersionsTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/OsVersionsTest.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.provision.provisioning; import com.yahoo.component.Version; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.hosted.provision.NodeRepositoryTester; -import org.junit.Before; import org.junit.Test; import java.time.Duration; @@ -22,15 +21,10 @@ import static org.junit.Assert.fail; */ public class OsVersionsTest { - private OsVersions versions; - - @Before - public void before() { - versions = new OsVersions( + private final OsVersions versions = new OsVersions( new NodeRepositoryTester().nodeRepository().database(), Duration.ofDays(1) // Long TTL to avoid timed expiry during test ); - } @Test public void test_versions() { |