Make TerminalImpl implement Terminal and remove outcommented code

2 files changed, 7 insertions, 16 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/TerminalImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/TerminalImpl.java
index 93c1055fc58..422584b8ccd 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/TerminalImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/TerminalImpl.java
@@ -1,14 +1,20 @@
 // 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.task.util.process;
 
+import com.yahoo.jdisc.Timer;
 import com.yahoo.vespa.hosted.node.admin.component.TaskContext;
 
 /**
  * @author hakonhall
  */
-public class TerminalImpl {
+public class TerminalImpl implements Terminal {
     private final ProcessFactory processFactory;
 
+    public TerminalImpl(Timer timer) {
+        this(new ProcessFactoryImpl(new ProcessStarterImpl(), timer));
+    }
+
+    /** For testing. */
     public TerminalImpl(ProcessFactory processFactory) {
         this.processFactory = processFactory;
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java
index 188de5a2f17..dbb4c909a4b 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java
@@ -88,21 +88,6 @@ public class Yum {
         }
 
         public boolean converge() {
-//            Terminal terminal;
-//            CommandLine commandLine = terminal.newCommandLine(taskContext);
-//            commandLine.add("yum", yumCommand, "--assumeyes");
-//            enabledRepo.ifPresent(repo -> commandLine.add("--enablerepo=" + repo));
-//            commandLine.add(packages);
-//            CommandResult result = commandLine.executeSilently();
-//
-//            String output = result.getUntrimmedOutput();
-//            if (commandOutputNoopPattern.matcher(output).find()) {
-//                return false;
-//            } else {
-//                commandLine.recordSilentExecutionAsSystemModification();
-//                return true;
-//            }
-
             Command command = commandSupplier.get();
             command.add("yum", yumCommand, "--assumeyes");
             enabledRepo.ifPresent(repo -> command.add("--enablerepo=" + repo));