From fe8aba65c5a739c4fd9352652f20a91a4ca66435 Mon Sep 17 00:00:00 2001 From: gongdewei Date: Thu, 21 May 2020 23:13:37 +0800 Subject: [PATCH] Replace JobControllerImpl with interface JobController --- .../taobao/arthas/core/shell/session/SessionManager.java | 4 ++-- .../core/shell/session/impl/SessionManagerImpl.java | 8 ++++---- .../core/shell/term/impl/http/api/HttpApiHandler.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/taobao/arthas/core/shell/session/SessionManager.java b/core/src/main/java/com/taobao/arthas/core/shell/session/SessionManager.java index e5198aee1..d891d258f 100644 --- a/core/src/main/java/com/taobao/arthas/core/shell/session/SessionManager.java +++ b/core/src/main/java/com/taobao/arthas/core/shell/session/SessionManager.java @@ -1,7 +1,7 @@ package com.taobao.arthas.core.shell.session; +import com.taobao.arthas.core.shell.system.JobController; import com.taobao.arthas.core.shell.system.impl.InternalCommandManager; -import com.taobao.arthas.core.shell.system.impl.JobControllerImpl; import java.lang.instrument.Instrumentation; @@ -25,5 +25,5 @@ public interface SessionManager { Instrumentation getInstrumentation(); - JobControllerImpl getJobController(); + JobController getJobController(); } diff --git a/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java b/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java index 22ec12e62..fb6cc5bd4 100644 --- a/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java +++ b/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionManagerImpl.java @@ -11,8 +11,8 @@ import com.taobao.arthas.core.shell.ShellServerOptions; import com.taobao.arthas.core.shell.session.Session; import com.taobao.arthas.core.shell.session.SessionManager; import com.taobao.arthas.core.shell.system.Job; +import com.taobao.arthas.core.shell.system.JobController; import com.taobao.arthas.core.shell.system.impl.InternalCommandManager; -import com.taobao.arthas.core.shell.system.impl.JobControllerImpl; import java.lang.instrument.Instrumentation; import java.util.*; @@ -28,7 +28,7 @@ public class SessionManagerImpl implements SessionManager { private final ArthasBootstrap bootstrap; private final InternalCommandManager commandManager; private final Instrumentation instrumentation; - private final JobControllerImpl jobController; + private final JobController jobController; private final long timeoutMillis; private final long reaperInterval; private final Map sessions; @@ -37,7 +37,7 @@ public class SessionManagerImpl implements SessionManager { private ScheduledExecutorService scheduledExecutorService; public SessionManagerImpl(ShellServerOptions options, ArthasBootstrap bootstrap, InternalCommandManager commandManager, - JobControllerImpl jobController) { + JobController jobController) { this.bootstrap = bootstrap; this.commandManager = commandManager; this.jobController = jobController; @@ -187,7 +187,7 @@ public class SessionManagerImpl implements SessionManager { } @Override - public JobControllerImpl getJobController() { + public JobController getJobController() { return jobController; } } diff --git a/core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/api/HttpApiHandler.java b/core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/api/HttpApiHandler.java index b614ca580..2b7b1f819 100644 --- a/core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/api/HttpApiHandler.java +++ b/core/src/main/java/com/taobao/arthas/core/shell/term/impl/http/api/HttpApiHandler.java @@ -20,9 +20,9 @@ import com.taobao.arthas.core.shell.history.impl.HistoryManagerImpl; import com.taobao.arthas.core.shell.session.Session; import com.taobao.arthas.core.shell.session.SessionManager; import com.taobao.arthas.core.shell.system.Job; +import com.taobao.arthas.core.shell.system.JobController; import com.taobao.arthas.core.shell.system.JobListener; import com.taobao.arthas.core.shell.system.impl.InternalCommandManager; -import com.taobao.arthas.core.shell.system.impl.JobControllerImpl; import com.taobao.arthas.core.shell.term.SignalHandler; import com.taobao.arthas.core.shell.term.Term; import com.taobao.arthas.core.util.ArthasBanner; @@ -58,7 +58,7 @@ public class HttpApiHandler { private final AtomicInteger requestIdGenerator = new AtomicInteger(0); private static HttpApiHandler instance; private final InternalCommandManager commandManager; - private final JobControllerImpl jobController; + private final JobController jobController; private final HistoryManager historyManager; private int jsonBufferSize = 1024 * 256;