Add Path/String variant of method

2 files changed, 12 insertions, 3 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
index 065792308df..63f469635f8 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContext.java
@@ -7,6 +7,7 @@ import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.node.admin.component.TaskContext;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 public interface NodeAgentContext extends TaskContext {
 
@@ -26,9 +27,17 @@ public interface NodeAgentContext extends TaskContext {
      */
     Path pathOnHostFromPathInNode(Path pathInNode);
 
+    default Path pathOnHostFromPathInNode(String pathInNode) {
+        return pathOnHostFromPathInNode(Paths.get(pathInNode));
+    }
+
     /**
      * @param relativePath relative path under Vespa home in container
      * @return the absolute path under Vespa home in the container
      */
-    Path pathInNodeUnderVespaHome(String relativePath);
+    Path pathInNodeUnderVespaHome(Path relativePath);
+
+    default Path pathInNodeUnderVespaHome(String relativePath) {
+        return pathInNodeUnderVespaHome(Paths.get(relativePath));
+    }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
index 089815a06bc..6d7110aeb51 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java
@@ -65,8 +65,8 @@ public class NodeAgentContextImpl implements NodeAgentContext {
     }
 
     @Override
-    public Path pathInNodeUnderVespaHome(String relativePath) {
-        if (Paths.get(relativePath).isAbsolute())
+    public Path pathInNodeUnderVespaHome(Path relativePath) {
+        if (relativePath.isAbsolute())
             throw new IllegalArgumentException("Expected a relative path to Vespa home, got: " + relativePath);
 
         return pathToVespaHome.resolve(relativePath);