Merge pull request #725 from amitjoy/fix/724

Removed deprecated usages
amitjoy · Jan 29, 2024 · c5801de · c5801de
2 parents 28c31a2 + 006a847
commit c5801de
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/com.osgifx.console.agent/src/main/java/com/osgifx/console/agent/provider/AgentServer.java b/com.osgifx.console.agent/src/main/java/com/osgifx/console/agent/provider/AgentServer.java
@@ -154,8 +154,8 @@ public enum RpcType {
         SOCKET_RPC
     }
 
-    private static final long          RESULT_TIMEOUT           = Duration.ofSeconds(20).toMillis();
-    private static final long          WATCHDOG_TIMEOUT         = Duration.ofSeconds(30).toMillis();
+    private static final Duration      RESULT_TIMEOUT           = Duration.ofSeconds(20);
+    private static final Duration      WATCHDOG_TIMEOUT         = Duration.ofSeconds(30);
     private static final AtomicInteger sequence                 = new AtomicInteger(1000);
     private static final Pattern       BSN_PATTERN              = Pattern.compile("\\s*([^;\\s]+).*");
     public static final String         PROPERTY_ENABLE_LOGGING  = "osgi.fx.enable.logging";
@@ -404,8 +404,9 @@ public String execCliCommand(final String command) {
                 cmdLine.addArgument(commandEntries.get(i));
             }
             final DefaultExecuteResultHandler resultHandler = new DefaultExecuteResultHandler();
-            final ExecuteWatchdog             watchdog      = new ExecuteWatchdog(WATCHDOG_TIMEOUT);
-            final Executor                    executor      = new DefaultExecutor();
+            final ExecuteWatchdog             watchdog      = ExecuteWatchdog.builder().setTimeout(WATCHDOG_TIMEOUT)
+                    .get();
+            final Executor                    executor      = DefaultExecutor.builder().get();
             final ByteArrayOutputStream       outputStream  = new ByteArrayOutputStream();
             final PumpStreamHandler           streamHandler = new PumpStreamHandler(outputStream);