diff --git a/core/src/main/java/com/taobao/arthas/core/command/model/InputStatusVO.java b/core/src/main/java/com/taobao/arthas/core/command/model/InputStatusModel.java similarity index 81% rename from core/src/main/java/com/taobao/arthas/core/command/model/InputStatusVO.java rename to core/src/main/java/com/taobao/arthas/core/command/model/InputStatusModel.java index 72350a1b8..b1da685a0 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/model/InputStatusVO.java +++ b/core/src/main/java/com/taobao/arthas/core/command/model/InputStatusModel.java @@ -4,11 +4,11 @@ package com.taobao.arthas.core.command.model; * Input status for webui * @author gongdewei 2020/4/14 */ -public class InputStatusVO extends ResultModel { +public class InputStatusModel extends ResultModel { private InputStatus inputStatus; - public InputStatusVO(InputStatus inputStatus) { + public InputStatusModel(InputStatus inputStatus) { this.inputStatus = inputStatus; } diff --git a/core/src/main/java/com/taobao/arthas/core/distribution/impl/SharingResultDistributorImpl.java b/core/src/main/java/com/taobao/arthas/core/distribution/impl/SharingResultDistributorImpl.java index 1444c5d5e..3ecd4ca2a 100644 --- a/core/src/main/java/com/taobao/arthas/core/distribution/impl/SharingResultDistributorImpl.java +++ b/core/src/main/java/com/taobao/arthas/core/distribution/impl/SharingResultDistributorImpl.java @@ -2,7 +2,7 @@ package com.taobao.arthas.core.distribution.impl; import com.alibaba.arthas.deps.org.slf4j.Logger; import com.alibaba.arthas.deps.org.slf4j.LoggerFactory; -import com.taobao.arthas.core.command.model.InputStatusVO; +import com.taobao.arthas.core.command.model.InputStatusModel; import com.taobao.arthas.core.command.model.MessageModel; import com.taobao.arthas.core.command.model.ResultModel; import com.taobao.arthas.core.distribution.DistributorOptions; @@ -138,15 +138,15 @@ public class SharingResultDistributorImpl implements SharingResultDistributor { private class SharingResultConsumerImpl implements ResultConsumer { private BlockingQueue resultQueue = new ArrayBlockingQueue(DistributorOptions.resultQueueSize); private ReentrantLock queueLock = new ReentrantLock(); - private InputStatusVO lastInputStatus; + private InputStatusModel lastInputStatus; @Override public boolean appendResult(ResultModel result) { queueLock.lock(); try { //输入状态不入历史指令队列,复制时在最后发送 - if (result instanceof InputStatusVO) { - lastInputStatus = (InputStatusVO) result; + if (result instanceof InputStatusModel) { + lastInputStatus = (InputStatusModel) result; return true; } while (!resultQueue.offer(result)) { 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 10d75cbf5..b614ca580 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 @@ -311,7 +311,7 @@ public class HttpApiHandler { * @param inputStatus */ private void updateSessionInputStatus(Session session, InputStatus inputStatus) { - session.getResultDistributor().appendResult(new InputStatusVO(inputStatus)); + session.getResultDistributor().appendResult(new InputStatusModel(inputStatus)); } private ApiResponse processJoinSessionRequest(ApiRequest apiRequest, Session session) { @@ -319,7 +319,7 @@ public class HttpApiHandler { //create consumer ResultConsumer resultConsumer = new ResultConsumerImpl(); //disable input and interrupt - resultConsumer.appendResult(new InputStatusVO(InputStatus.DISABLED)); + resultConsumer.appendResult(new InputStatusModel(InputStatus.DISABLED)); session.getResultDistributor().addConsumer(resultConsumer); ApiResponse response = new ApiResponse();