Browse Source

fix: 改包名后一些包名导入错误

370774330@qq.com 5 năm trước cách đây
mục cha
commit
2003ef024c

+ 1 - 2
api/src/main/java/cn/seecoder/api/DevcloudApiAutoConfiguration.java

@@ -12,8 +12,7 @@ import cn.seecoder.api.docker.DockerApi;
 import cn.seecoder.api.docker.impl.DockerApiImpl;
 import cn.seecoder.api.git.GitApi;
 import cn.seecoder.api.git.impl.GitApiImpl;
-import seecoder.devcloud.api.k8s.*;
-import seecoder.devcloud.api.k8s.impl.*;
+
 
 /**
  * @author PuHong Weng

+ 6 - 8
core/src/main/java/cn/seecoder/core/pipeline/config/HandlerConfigTable.java

@@ -7,8 +7,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
-import seecoder.devcloud.core.pipeline.handler.*;
-
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -23,12 +21,12 @@ import java.util.Map;
 @Slf4j
 public class HandlerConfigTable {
 
-    private static final Map<String, Class<?>> handlerConfigMap;
-
     /**
-     * 表驱动的设置
-     * 注意这里的对应并不是一一对应,而是多对一
+     * 根据名称映射对应的流水线执行类
      */
+    private static final Map<String, Class<?>> handlerConfigMap;
+
+
     static {
         handlerConfigMap = new HashMap<>();
         handlerConfigMap.put("node-image-build", NodeImageBuildHandler.class);
@@ -40,7 +38,7 @@ public class HandlerConfigTable {
     }
 
     public static Handler transToHandler(String name, JsonNode config) throws Exception {
-        Handler handler = null;
+        Handler handler;
         try {
             handler = (Handler) handlerConfigMap.get(name).newInstance();
         } catch (InstantiationException | IllegalAccessException e) {
@@ -53,7 +51,7 @@ public class HandlerConfigTable {
             String propertyName = entry.getKey();
             JsonNode propertyValues = entry.getValue();
             ObjectMapper mapper = new ObjectMapper();
-            Field field = null;
+            Field field ;
             field = handler.getClass().getDeclaredField(propertyName);
             field.setAccessible(true);
             field.set(handler, mapper.readValue(propertyValues.traverse(), field.getType()));

+ 1 - 3
web/src/main/java/cn/seecoder/web/service/impl/tree/TreeNodeServiceImpl.java

@@ -20,8 +20,6 @@ import org.springframework.transaction.annotation.Transactional;
 import cn.seecoder.common.exceptions.ServiceException;
 import cn.seecoder.common.util.DateUtil;
 import cn.seecoder.core.commit.CommitState;
-import seecoder.devcloud.web.model.enums.*;
-
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -182,7 +180,7 @@ public class TreeNodeServiceImpl implements TreeNodeService {
     private List<TreeNodeVO> getTreeNodeVOS(List<TreeNodePO> nodesPO) {
         int projectId = nodesPO.get(0).getProjectId();
         List<Integer> userIds = nodesPO.stream().filter(x->x.getProcessorId()!=null).map(TreeNodePO::getProcessorId).collect(Collectors.toList());
-        Map<Integer,String> usernameMap = userIds.size() == 0? Collections.EMPTY_MAP : userMapper.selectByIds(userIds).stream().collect(Collectors.toMap(UserPO::getId, UserPO::getUsername));
+        Map<Integer,String> usernameMap = userIds.size() == 0? new HashMap<>() : userMapper.selectByIds(userIds).stream().collect(Collectors.toMap(UserPO::getId, UserPO::getUsername));
         List<CommitPO> commits = commitMapper.selectByProjectIdAndType(projectId, CommitRelatedType.TREE_ID);
         Map<Integer, List<CommitPO>> commitsMap = commits.stream().collect(Collectors.groupingBy(CommitPO::getRelatedId));
         return nodesPO.stream().map(po -> new TreeNodeVO(po,usernameMap.getOrDefault(po.getProcessorId(),"no one"),commitsMap.getOrDefault(po.getId(),new ArrayList<>()))).collect(Collectors.toList());