fix import of common helper package

Author: gy2006

core/src/main/java/com/flowci/core/Application.java

@@ -16,7 +16,7 @@
 
 package com.flowci.core;
 
-import com.flowci.util.StringHelper;
+import com.flowci.common.helper.StringHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;

core/src/main/java/com/flowci/core/agent/dao/CustomAgentDaoImpl.java

@@ -1,7 +1,7 @@
 package com.flowci.core.agent.dao;
 
+import com.flowci.common.helper.ObjectsHelper;
 import com.flowci.core.agent.domain.Agent;
-import com.flowci.util.ObjectsHelper;
 import com.mongodb.client.result.UpdateResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoOperations;

core/src/main/java/com/flowci/core/agent/domain/AgentHostOption.java

@@ -17,13 +17,13 @@
 package com.flowci.core.agent.domain;
 
 import com.flowci.common.exception.ArgumentException;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.Set;
 

core/src/main/java/com/flowci/core/agent/domain/AgentOption.java

@@ -17,10 +17,10 @@
 package com.flowci.core.agent.domain;
 
 import com.google.common.base.Strings;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotEmpty;
 import java.util.Set;
 
 /**

core/src/main/java/com/flowci/core/agent/domain/DeleteAgent.java

@@ -17,7 +17,7 @@
 
 package com.flowci.core.agent.domain;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

core/src/main/java/com/flowci/core/agent/service/AgentHostServiceImpl.java

@@ -16,6 +16,9 @@
 
 package com.flowci.core.agent.service;
 
+import com.flowci.common.exception.NotAvailableException;
+import com.flowci.common.exception.NotFoundException;
+import com.flowci.common.helper.StringHelper;
 import com.flowci.core.agent.dao.AgentDao;
 import com.flowci.core.agent.dao.AgentHostDao;
 import com.flowci.core.agent.domain.*;
@@ -37,13 +40,11 @@
 import com.flowci.docker.DockerSSHManager;
 import com.flowci.docker.K8sManager;
 import com.flowci.docker.domain.*;
-import com.flowci.common.exception.NotAvailableException;
-import com.flowci.common.exception.NotFoundException;
-import com.flowci.util.StringHelper;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.RemovalCause;
 import com.github.benmanes.caffeine.cache.RemovalListener;
 import com.google.common.base.Preconditions;
+import jakarta.annotation.PostConstruct;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +56,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;

core/src/main/java/com/flowci/core/agent/service/AgentServiceImpl.java

@@ -17,6 +17,10 @@
 package com.flowci.core.agent.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.flowci.common.exception.DuplicateException;
+import com.flowci.common.exception.NotFoundException;
+import com.flowci.common.exception.StatusException;
+import com.flowci.common.helper.ObjectsHelper;
 import com.flowci.core.agent.dao.AgentDao;
 import com.flowci.core.agent.dao.AgentProfileDao;
 import com.flowci.core.agent.domain.*;
@@ -32,21 +36,17 @@
 import com.flowci.core.common.manager.SpringTaskManager;
 import com.flowci.core.common.rabbit.RabbitOperations;
 import com.flowci.core.job.event.NoIdleAgentEvent;
-import com.flowci.common.exception.DuplicateException;
-import com.flowci.common.exception.NotFoundException;
-import com.flowci.common.exception.StatusException;
 import com.flowci.tree.Selector;
-import com.flowci.util.ObjectsHelper;
 import com.flowci.zookeeper.InterLock;
 import com.flowci.zookeeper.ZookeeperClient;
 import com.google.common.collect.Sets;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.*;
@@ -159,7 +159,7 @@ public void lockNodeCleanup() {
  String agentId = Util.getAgentIdFromLockPath(path);
  Optional<Agent> optional = agentDao.findById(agentId);
 
- if (!optional.isPresent()) {
+ if (optional.isEmpty()) {
  try {
  zk.delete(path, true);
  } catch (Throwable ignore) {
@@ -175,7 +175,7 @@ public void lockNodeCleanup() {
  @Override
  public Agent get(String id) {
  Optional<Agent> optional = agentDao.findById(id);
- if (!optional.isPresent()) {
+ if (optional.isEmpty()) {
  throw new NotFoundException("Agent {0} does not existed", id);
  }
  return optional.get();

core/src/main/java/com/flowci/core/api/adviser/ApiAuth.java

@@ -16,16 +16,15 @@
 
 package com.flowci.core.api.adviser;
 
-import com.flowci.core.agent.service.AgentService;
 import com.flowci.common.exception.AuthenticationException;
-import com.flowci.util.StringHelper;
+import com.flowci.common.helper.StringHelper;
+import com.flowci.core.agent.service.AgentService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * To verify token from agent
  */

core/src/main/java/com/flowci/core/api/domain/AddStatsItem.java

@@ -16,12 +16,13 @@
 
 package com.flowci.core.api.domain;
 
-import java.util.HashMap;
-import java.util.Map;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author yang
  */
@@ -33,5 +34,4 @@ public final class AddStatsItem {
  private String type;
 
  private Map<String, Float> data = new HashMap<>();
-
 }

core/src/main/java/com/flowci/core/api/domain/CreateJobArtifact.java

@@ -16,10 +16,9 @@
 
 package com.flowci.core.api.domain;
 
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-
 @Data
 public class CreateJobArtifact {