refactor: Split hertzbeat-common into core and spring modules (#4035)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: zqr10159 <30048352+zqr10159@users.noreply.github.com>
Co-authored-by: Tomsun28 <tomsun28@outlook.com>

.github/workflows/backend-build-test.yml

@@ -66,11 +66,11 @@ jobs:
         run: |
           sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
           sudo chmod u+x /usr/local/bin/docker-compose
-          
+
           cd e2e
           sudo docker-compose version
           sudo docker-compose up --exit-code-from testing --remove-orphans
-      
+
       # upload application logs
       - name: Upload logs & API test reports
         uses: actions/upload-artifact@v4

hertzbeat-ai/pom.xml

@@ -59,7 +59,7 @@
         </dependency>
 		<dependency>
 			<groupId>org.apache.hertzbeat</groupId>
-			<artifactId>hertzbeat-common</artifactId>
+			<artifactId>hertzbeat-common-spring</artifactId>
 		</dependency>
         <!-- common -->
         <dependency>

hertzbeat-base/pom.xml

@@ -35,7 +35,7 @@
         <!-- common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-spring</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>

hertzbeat-collector/hertzbeat-collector-common/pom.xml

@@ -49,7 +49,7 @@
         <!-- common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-core</artifactId>
         </dependency>
         <!-- linux ssh -->
         <dependency>

hertzbeat-collector/pom.xml

@@ -81,7 +81,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-core</artifactId>
         </dependency>
     </dependencies>
 

hertzbeat-common-core/pom.xml

@@ -26,62 +26,10 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hertzbeat-common</artifactId>
+    <artifactId>hertzbeat-common-core</artifactId>
     <name>${project.artifactId}</name>
 
     <dependencies>
-        <!-- spring -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-        </dependency>
-        <!-- jpa -->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>${eclipse-jpa.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- validation -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <!-- jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-        </dependency>
-        <!-- swagger -->
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <!-- Tool dependencies  -->
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -187,6 +135,39 @@
             <groupId>com.github.jsqlparser</groupId>
             <artifactId>jsqlparser</artifactId>
         </dependency>
+        <!-- jackson for optional json processing -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- swagger annotations (optional) -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- validation annotations (optional) -->
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- jakarta annotations -->
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java

@@ -17,13 +17,13 @@
 
 package org.apache.hertzbeat.common.entity.dto;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.hertzbeat.common.constants.ImportTaskStatusEnum;
 import org.apache.hertzbeat.common.constants.ManagerEventTypeEnum;
 import org.apache.hertzbeat.common.constants.NotifyLevelEnum;
-import org.springframework.lang.Nullable;
 
 /**
  * Import task message

hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java

@@ -486,7 +486,7 @@ public final class CollectRep {
             }
 
             public long getTime() {
-                return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.TIME, "0"));
+                return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TIME, "0"));
             }
 
             public Code getCode() {