rename BizModel to BizInfo

sofastack · Sep 7, 2023 · ab86722 · ab86722
1 parent 58378b0
commit ab86722
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/...va/com/alipay/sofa/serverless/arklet/core/command/builtin/handler/QueryAllBizHandler.java b/...va/com/alipay/sofa/serverless/arklet/core/command/builtin/handler/QueryAllBizHandler.java
@@ -21,7 +21,7 @@
 
 import com.alipay.sofa.ark.spi.model.Biz;
 import com.alipay.sofa.serverless.arklet.core.command.builtin.BuiltinCommand;
-import com.alipay.sofa.serverless.arklet.core.command.builtin.model.BizModel;
+import com.alipay.sofa.serverless.arklet.core.command.builtin.model.BizInfo;
 import com.alipay.sofa.serverless.arklet.core.command.meta.AbstractCommandHandler;
 import com.alipay.sofa.serverless.arklet.core.command.meta.Command;
 import com.alipay.sofa.serverless.arklet.core.command.meta.Output;
@@ -32,22 +32,22 @@
  * @author mingmen
  * @date 2023/6/14
  */
-public class QueryAllBizHandler extends AbstractCommandHandler<InputMeta, List<BizModel>> {
+public class QueryAllBizHandler extends AbstractCommandHandler<InputMeta, List<BizInfo>> {
 
     @Override
-    public Output<List<BizModel>> handle(InputMeta inputMeta) {
+    public Output<List<BizInfo>> handle(InputMeta inputMeta) {
         List<Biz> bizList = getOperationService().queryBizList();
-        List<BizModel> bizModels = new ArrayList<>(bizList.size());
+        List<BizInfo> bizInfos = new ArrayList<>(bizList.size());
         for (Biz biz : bizList) {
-            BizModel model = new BizModel();
+            BizInfo model = new BizInfo();
             model.setBizName(biz.getBizName());
             model.setBizVersion(biz.getBizVersion());
             model.setBizState(biz.getBizState());
             model.setMainClass(biz.getMainClass());
             model.setWebContextPath(biz.getWebContextPath());
-            bizModels.add(model);
+            bizInfos.add(model);
         }
-        return Output.ofSuccess(bizModels);
+        return Output.ofSuccess(bizInfos);
     }
 
     @Override

diff --git a/.../core/command/builtin/model/BizModel.java → ...t/core/command/builtin/model/BizInfo.java b/.../core/command/builtin/model/BizModel.java → ...t/core/command/builtin/model/BizInfo.java
@@ -22,7 +22,7 @@
  * @author mingmen
  * @date 2023/6/14
  */
-public class BizModel {
+public class BizInfo {
     private String   bizName;
 
     private String   bizVersion;

diff --git a/...rklet-core/src/main/java/com/alipay/sofa/serverless/arklet/core/health/HealthService.java b/...rklet-core/src/main/java/com/alipay/sofa/serverless/arklet/core/health/HealthService.java
@@ -19,7 +19,7 @@
 import com.alipay.sofa.serverless.arklet.core.ArkletComponent;
 import com.alipay.sofa.serverless.arklet.core.health.indicator.ArkletBaseIndicator;
 import com.alipay.sofa.serverless.arklet.core.health.model.Health;
-import com.alipay.sofa.serverless.arklet.core.command.builtin.model.BizModel;
+import com.alipay.sofa.serverless.arklet.core.command.builtin.model.BizInfo;
 import com.alipay.sofa.serverless.arklet.core.command.builtin.model.PluginModel;
 
 /**
@@ -37,7 +37,7 @@ public interface HealthService extends ArkletComponent {
 
     Health queryModuleInfo(String type, String name, String version);
 
-    Health queryModuleInfo(BizModel bizModel);
+    Health queryModuleInfo(BizInfo bizInfo);
 
     Health queryModuleInfo(PluginModel pluginModel);
 

diff --git a/...t-core/src/main/java/com/alipay/sofa/serverless/arklet/core/health/HealthServiceImpl.java b/...t-core/src/main/java/com/alipay/sofa/serverless/arklet/core/health/HealthServiceImpl.java
@@ -30,7 +30,7 @@
 import com.alipay.sofa.serverless.arklet.core.health.model.Constants;
 import com.alipay.sofa.serverless.arklet.core.health.model.Health;
 import com.alipay.sofa.serverless.arklet.core.health.model.PluginHealthMeta;
-import com.alipay.sofa.serverless.arklet.core.command.builtin.model.BizModel;
+import com.alipay.sofa.serverless.arklet.core.command.builtin.model.BizInfo;
 import com.alipay.sofa.serverless.arklet.core.command.builtin.model.PluginModel;
 import com.alipay.sofa.serverless.arklet.core.common.log.ArkletLogger;
 import com.alipay.sofa.serverless.arklet.core.common.log.ArkletLoggerFactory;
@@ -99,7 +99,7 @@ public Health getHealth(String[] indicatorIds) {
     @Override
     public Health queryModuleInfo() {
         return Health.createHealth().putAllHealthData(queryMasterBiz())
-            .putAllHealthData(queryModuleInfo(new BizModel()))
+            .putAllHealthData(queryModuleInfo(new BizInfo()))
             .putAllHealthData(queryModuleInfo(new PluginModel()));
     }
 
@@ -110,10 +110,10 @@ public Health queryModuleInfo(String type, String name, String version) {
             AssertUtils.isTrue(StringUtils.isEmpty(type) || Constants.typeOfInfo(type),
                 "illegal type: %s", type);
             if (StringUtils.isEmpty(type) || Constants.BIZ.equals(type)) {
-                BizModel bizModel = new BizModel();
-                bizModel.setBizName(name);
-                bizModel.setBizVersion(version);
-                health.putAllHealthData(queryModuleInfo(bizModel));
+                BizInfo bizInfo = new BizInfo();
+                bizInfo.setBizName(name);
+                bizInfo.setBizVersion(version);
+                health.putAllHealthData(queryModuleInfo(bizInfo));
             }
             if (StringUtils.isEmpty(type) || Constants.PLUGIN.equals(type)) {
                 PluginModel pluginModel = new PluginModel();
@@ -128,8 +128,8 @@ public Health queryModuleInfo(String type, String name, String version) {
     }
 
     @Override
-    public Health queryModuleInfo(BizModel bizModel) {
-        String bizName = bizModel.getBizName(), bizVersion = bizModel.getBizVersion();
+    public Health queryModuleInfo(BizInfo bizInfo) {
+        String bizName = bizInfo.getBizName(), bizVersion = bizInfo.getBizVersion();
         Health health = Health.createHealth();
         try {
             if (StringUtils.isEmpty(bizName) && StringUtils.isEmpty(bizVersion)) {