aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <valerij92@gmail.com>2018-05-07 22:31:23 +0200
committerValerij Fredriksen <valerij92@gmail.com>2018-05-07 22:31:23 +0200
commit657443bdcaf95789420135f9f98e8c9fcf89fc68 (patch)
tree061c405195221fc5672084449199a1586ef56d83
parente6779668670a657023114b9c0d70693b4135dcce (diff)
Make stuff final
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLine.java4
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java4
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesMock.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java4
5 files changed, 8 insertions, 8 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index d150fc03662..e3920d71d19 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -52,7 +52,7 @@ public class StorageMaintainer {
private final Environment environment;
private final Clock clock;
- private Map<ContainerName, MaintenanceThrottler> maintenanceThrottlerByContainerName = new ConcurrentHashMap<>();
+ private final Map<ContainerName, MaintenanceThrottler> maintenanceThrottlerByContainerName = new ConcurrentHashMap<>();
public StorageMaintainer(DockerOperations dockerOperations, ProcessExecuter processExecuter, MetricReceiverWrapper metricReceiver, Environment environment, Clock clock) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLine.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLine.java
index 9eaa2395d21..9a8e3918872 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLine.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandLine.java
@@ -24,8 +24,8 @@ import java.util.stream.Collectors;
* @author hakonhall
*/
public class CommandLine {
- private static Logger logger = Logger.getLogger(CommandLine.class.getName());
- private static Pattern UNESCAPED_ARGUMENT_PATTERN = Pattern.compile("^[a-zA-Z0-9=!@%/+:.,_-]+$");
+ private static final Logger logger = Logger.getLogger(CommandLine.class.getName());
+ private static final Pattern UNESCAPED_ARGUMENT_PATTERN = Pattern.compile("^[a-zA-Z0-9=!@%/+:.,_-]+$");
/** The default timeout. See setTimeout() for details. */
public static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(10);
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java
index f5e49bc9f44..3bcfde2bbb4 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java
@@ -11,8 +11,8 @@ import java.util.logging.Logger;
* @author valerijf
*/
public class PrefixLogger {
- private String prefix;
- private Logger logger;
+ private final String prefix;
+ private final Logger logger;
private <T> PrefixLogger(Class<T> clazz, String prefix) {
this.logger = Logger.getLogger(clazz.getName());
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesMock.java
index 4a103c89446..4dec4ece27e 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddressesMock.java
@@ -12,7 +12,7 @@ import java.util.Map;
*/
public class IPAddressesMock implements IPAddresses {
- Map<String, List<InetAddress>> otherAddresses = new HashMap<>();
+ private final Map<String, List<InetAddress>> otherAddresses = new HashMap<>();
public IPAddressesMock addAddress(String hostname, String ip) {
List<InetAddress> addresses = otherAddresses.getOrDefault(hostname, new ArrayList<>());
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
index e5bec3c912d..d29d8741438 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
@@ -14,8 +14,8 @@ import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
public class YumTest {
- private TaskContext taskContext = mock(TaskContext.class);
- private TestTerminal terminal = new TestTerminal();
+ private final TaskContext taskContext = mock(TaskContext.class);
+ private final TestTerminal terminal = new TestTerminal();
@Before
public void tearDown() {