[#noissue] Cleanup

Author: donghun-cho

hbase-uid-module/src/main/java/com/navercorp/pinpoint/uid/dao/hbase/HbaseApplicationUidAttrDao.java

@@ -12,14 +12,14 @@
 import com.navercorp.pinpoint.uid.utils.UidBytesCreateUtils;
 import com.navercorp.pinpoint.uid.vo.ApplicationUidAttrRow;
 import com.navercorp.pinpoint.uid.vo.ApplicationUidAttribute;
-import jakarta.annotation.Nullable;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.CheckAndMutate;
 import org.apache.hadoop.hbase.client.CheckAndMutateResult;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Scan;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
 

hbase-uid-module/src/main/java/com/navercorp/pinpoint/uid/service/ApplicationCleanupService.java

@@ -1,7 +1,7 @@
 package com.navercorp.pinpoint.uid.service;
 
 import com.navercorp.pinpoint.common.server.uid.ServiceUid;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @Deprecated
 public interface ApplicationCleanupService {

hbase-uid-module/src/main/java/com/navercorp/pinpoint/uid/service/ApplicationCleanupServiceImpl.java

@@ -6,9 +6,9 @@
 import com.navercorp.pinpoint.uid.dao.ApplicationUidDao;
 import com.navercorp.pinpoint.uid.vo.ApplicationUidAttrRow;
 import com.navercorp.pinpoint.uid.vo.ApplicationUidAttribute;
-import jakarta.annotation.Nullable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.jspecify.annotations.Nullable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/nodes/ServerInstance.java

@@ -21,7 +21,7 @@
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.web.vo.agent.AgentInfo;
 import com.navercorp.pinpoint.web.vo.agent.AgentStatus;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 

web/src/main/java/com/navercorp/pinpoint/web/service/ApplicationAgentListService.java

@@ -5,7 +5,7 @@
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus;
 import com.navercorp.pinpoint.web.vo.agent.AgentInfo;
-import jakarta.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.function.Predicate;

web/src/main/java/com/navercorp/pinpoint/web/service/ApplicationIndexServiceV2Impl.java

@@ -6,6 +6,7 @@
 import com.navercorp.pinpoint.web.dao.ApplicationDao;
 import com.navercorp.pinpoint.web.uid.service.ServiceUidService;
 import com.navercorp.pinpoint.web.vo.Application;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -18,10 +19,10 @@ public class ApplicationIndexServiceV2Impl implements ApplicationIndexServiceV2
     private final ApplicationDao applicationDao;
     private final AgentIdDao agentIdDao;
 
-    public ApplicationIndexServiceV2Impl(ServiceUidService serviceUidService,
+    public ApplicationIndexServiceV2Impl(@Autowired(required = false) ServiceUidService serviceUidService,
                                          ApplicationDao applicationDao,
                                          AgentIdDao agentIdDao) {
-        this.serviceUidService = Objects.requireNonNull(serviceUidService, "serviceUidService");
+        this.serviceUidService = serviceUidService;
         this.applicationDao = Objects.requireNonNull(applicationDao, "applicationDao");
         this.agentIdDao = Objects.requireNonNull(agentIdDao, "agentIdDao");
     }
@@ -65,7 +66,7 @@ public void deleteAgents(String serviceName, String applicationName, int service
     }
 
     private ServiceUid handleServiceUid(String serviceName) {
-        if (StringUtils.isEmpty(serviceName)) {
+        if (serviceUidService == null || StringUtils.isEmpty(serviceName)) {
             return ServiceUid.DEFAULT;
         }
         ServiceUid serviceUid = serviceUidService.getServiceUid(serviceName);

web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentAndStatus.java

@@ -1,8 +1,8 @@
 package com.navercorp.pinpoint.web.vo.agent;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import org.jspecify.annotations.Nullable;
 
-import jakarta.annotation.Nullable;
 import java.util.Objects;
 
 public class AgentAndStatus {

web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusAndLink.java

@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.navercorp.pinpoint.web.hyperlink.HyperLink;
+import org.jspecify.annotations.Nullable;
 
-import jakarta.annotation.Nullable;
 import java.util.List;
 import java.util.Objects;
 

web/src/main/java/com/navercorp/pinpoint/web/vo/agent/DetailedAgentInfo.java

@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.navercorp.pinpoint.common.server.bo.JvmInfoBo;
 import com.navercorp.pinpoint.common.server.bo.ServerMetaDataBo;
+import org.jspecify.annotations.Nullable;
 
-import jakarta.annotation.Nullable;
 import java.util.Objects;
 
 /**