Always read from disk in StoredInteger

1 files changed, 6 insertions, 36 deletions

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 79283983303..2d52622db0a 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
@@ -3,10 +3,6 @@ package com.yahoo.vespa.hosted.node.admin.task.util.file;
 
 import com.yahoo.vespa.hosted.node.admin.component.TaskContext;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.Optional;
@@ -23,50 +19,24 @@ public class StoredInteger implements Supplier<OptionalInt> {
 
     private static final Logger logger = Logger.getLogger(StoredInteger.class.getName());
 
-    private final Path path;
-    private OptionalInt value;
-    private boolean hasBeenRead = false;
-    private Optional<Instant> lastModifiedTime;
+    private final UnixPath path;
 
     public StoredInteger(Path path) {
-        this.path = path;
+        this.path = new UnixPath(path);
     }
 
     @Override
     public OptionalInt get() {
-        if (!hasBeenRead) readValue();
-        return value;
+        return path.readUtf8FileIfExists().stream().mapToInt(Integer::parseInt).findAny();
     }
 
     public void write(TaskContext taskContext, int value) {
-        try {
-            Files.write(path, Integer.toString(value).getBytes());
-            this.value = OptionalInt.of(value);
-            this.hasBeenRead = true;
-            this.lastModifiedTime = Optional.of(Instant.now());
-            taskContext.log(logger, "Stored new integer in %s: %d", path, value);
-        } catch (IOException e) {
-            throw new UncheckedIOException("Failed to store integer in " + path, e);
-        }
+        path.writeUtf8File(Integer.toString(value));
+        taskContext.log(logger, "Stored new integer in %s: %d", path, value);
     }
 
     public Optional<Instant> getLastModifiedTime() {
-        if (!hasBeenRead) readValue();
-        return lastModifiedTime;
-    }
-
-    private void readValue() {
-        try {
-            String value = new String(Files.readAllBytes(path));
-            this.value = OptionalInt.of(Integer.parseInt(value));
-            this.lastModifiedTime = Optional.of(Files.getLastModifiedTime(path).toInstant());
-        } catch (NoSuchFileException e) {
-            this.value = OptionalInt.empty();
-            this.lastModifiedTime = Optional.empty();
-        } catch (IOException e) {
-            throw new UncheckedIOException("Failed to read integer in " + path, e);
-        }
-        hasBeenRead = true;
+        return path.getAttributesIfExists().map(FileAttributes::lastModifiedTime);
     }
 
 }