diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-08-06 09:51:53 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2018-08-06 09:51:53 +0200 |
commit | 6bccd6b4e036fcc4bd2bf8e30ba99bcd9fcf27e9 (patch) | |
tree | d31aace330cce8679467ef1f5b104f98746dbdda /node-admin | |
parent | 203f104cadd7c8c08927b13ac55223a082334b88 (diff) |
Minor fixes
Diffstat (limited to 'node-admin')
7 files changed, 6 insertions, 16 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java index 93243f8b8ed..9e94f6ed7e4 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java @@ -1,20 +1,14 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.node.admin.component; -import com.google.common.base.Strings; -import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.api.AthenzService; import com.yahoo.vespa.athenz.utils.AthenzIdentities; import com.yahoo.vespa.hosted.node.admin.config.ConfigServerConfig; -import com.yahoo.vespa.hosted.node.admin.util.KeyStoreOptions; import java.net.URI; -import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.function.Function; import static java.util.stream.Collectors.toMap; diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java index 2c15912ae58..a815515ac83 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; */ public class StoredInteger implements Supplier<OptionalInt> { - private static Logger logger = Logger.getLogger(StoredInteger.class.getName()); + private static final Logger logger = Logger.getLogger(StoredInteger.class.getName()); private final Path path; private OptionalInt value; diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcessException.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcessException.java index 9f7aaab2060..cbc8ffbf1b7 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcessException.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcessException.java @@ -65,7 +65,7 @@ public abstract class ChildProcessException extends RuntimeException { if (possiblyHugeOutput.length() <= maxOutputPrefix + maxOutputSuffix + maxOutputSlack) { stringBuilder.append(possiblyHugeOutput); } else { - stringBuilder.append(possiblyHugeOutput.substring(0, maxOutputPrefix)) + stringBuilder.append(possiblyHugeOutput, 0, maxOutputPrefix) .append("... [") .append(possiblyHugeOutput.length() - maxOutputPrefix - maxOutputSuffix) .append(" chars omitted] ...") diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java index db14efdd5d2..a1af36f9c21 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java @@ -11,10 +11,6 @@ import com.yahoo.vespa.hosted.provision.Node; import org.junit.Ignore; import org.junit.Test; -import java.util.Optional; - -import static org.hamcrest.core.Is.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; /** diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java index 91c61623ee7..c348dc4c8b5 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java @@ -25,6 +25,7 @@ import java.util.stream.Collectors; import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @@ -152,7 +153,7 @@ public class NodeAdminImplTest { assertTrue(nodeAdmin.isFrozen()); assertTrue(nodeAdmin.subsystemFreezeDuration().isZero()); clock.advance(Duration.ofSeconds(1)); - assertTrue(nodeAdmin.subsystemFreezeDuration().equals(Duration.ofSeconds(1))); + assertEquals(Duration.ofSeconds(1), nodeAdmin.subsystemFreezeDuration()); // Unfreezing floors freeze duration assertTrue(nodeAdmin.setFrozen(false)); // Unfreeze everything @@ -164,7 +165,7 @@ public class NodeAdminImplTest { assertTrue(nodeAdmin.setFrozen(true)); assertTrue(nodeAdmin.subsystemFreezeDuration().isZero()); clock.advance(Duration.ofSeconds(1)); - assertTrue(nodeAdmin.subsystemFreezeDuration().equals(Duration.ofSeconds(1))); + assertEquals(Duration.ofSeconds(1), nodeAdmin.subsystemFreezeDuration()); } @Test diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectoryTest.java index a83f3bbe7d4..b714ab539f6 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectoryTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectoryTest.java @@ -25,7 +25,7 @@ public class MakeDirectoryTest { private final FileSystem fileSystem = TestFileSystem.create(); private final TestTaskContext context = new TestTaskContext(); - private String path = "/parent/dir"; + private final String path = "/parent/dir"; private String permissions = "rwxr----x"; private String owner = "test-owner"; private String group = "test-group"; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLineTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLineTest.java index 5bc45d7540e..a5eb0ab059b 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLineTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLineTest.java @@ -104,7 +104,6 @@ public class CommandLineTest { @Test public void programFails() { - TestChildProcess2 child = new TestChildProcess2(0, ""); terminal.expectCommand("foo 2>&1", 1, ""); try { commandLine.add("foo").execute(); |