refactor: make event file store optional

2026-07-01 07:51:45 +08:00
parent 51b1dd4174
commit 56a6c01f95
32 changed files with 139 additions and 84 deletions
--- a/modules/services/event-history-service/pom.xml
+++ b/modules/services/event-history-service/pom.xml
@@ -14,7 +14,7 @@
    <dependencies>
        <dependency>
            <groupId>com.lingniu.ingest</groupId>
-            <artifactId>event-file-store</artifactId>
+            <artifactId>ingest-api</artifactId>
        </dependency>
        <dependency>
            <groupId>com.lingniu.ingest</groupId>
--- a/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/EventHistoryController.java
+++ b/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/EventHistoryController.java
@@ -1,9 +1,9 @@
 package com.lingniu.ingest.eventhistory;

 import com.lingniu.ingest.api.ProtocolId;
-import com.lingniu.ingest.eventfilestore.EventFileQuery;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
-import com.lingniu.ingest.eventfilestore.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileQuery;
+import com.lingniu.ingest.api.history.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileStore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.GetMapping;
--- a/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/EventHistoryEnvelopeIngestor.java
+++ b/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/EventHistoryEnvelopeIngestor.java
@@ -3,8 +3,8 @@ package com.lingniu.ingest.eventhistory;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.lingniu.ingest.api.consumer.EnvelopeBatchIngestor;
 import com.lingniu.ingest.api.consumer.EnvelopeIngestResult;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
-import com.lingniu.ingest.eventfilestore.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileStore;
 import com.lingniu.ingest.sink.mq.proto.VehicleEnvelope;
 import com.lingniu.ingest.tdenginehistory.TdengineEnvelopeRows;
 import com.lingniu.ingest.tdenginehistory.TdengineHistoryWriter;
--- a/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/Gb32960DecodedFrameService.java
+++ b/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/Gb32960DecodedFrameService.java
@@ -3,9 +3,9 @@ package com.lingniu.ingest.eventhistory;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lingniu.ingest.api.ProtocolId;
-import com.lingniu.ingest.eventfilestore.EventFileQuery;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
-import com.lingniu.ingest.eventfilestore.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileQuery;
+import com.lingniu.ingest.api.history.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileStore;
 import com.lingniu.ingest.protocol.gb32960.codec.Gb32960MessageDecoder;
 import com.lingniu.ingest.protocol.gb32960.model.Gb32960Message;
 import com.lingniu.ingest.protocol.gb32960.model.InfoBlock;
--- a/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/Gb32960FrameController.java
+++ b/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/Gb32960FrameController.java
@@ -1,6 +1,6 @@
 package com.lingniu.ingest.eventhistory;

-import com.lingniu.ingest.eventfilestore.EventFileQuery;
+import com.lingniu.ingest.api.history.EventFileQuery;
 import com.lingniu.ingest.tdenginehistory.TdenginePageCursor;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
--- a/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/TelemetryEnvelopeRecordMapper.java
+++ b/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/TelemetryEnvelopeRecordMapper.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lingniu.ingest.api.ProtocolId;
 import com.lingniu.ingest.api.event.RawArchiveKeys;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileRecord;
 import com.lingniu.ingest.sink.mq.proto.RawArchiveRef;
 import com.lingniu.ingest.sink.mq.proto.VehicleEnvelope;
 import com.google.protobuf.InvalidProtocolBufferException;
--- a/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/config/EventHistoryAutoConfiguration.java
+++ b/modules/services/event-history-service/src/main/java/com/lingniu/ingest/eventhistory/config/EventHistoryAutoConfiguration.java
@@ -2,7 +2,7 @@ package com.lingniu.ingest.eventhistory.config;

 import com.lingniu.ingest.api.consumer.EnvelopeConsumerProcessor;
 import com.lingniu.ingest.api.consumer.EnvelopeDeadLetterSink;
-import com.lingniu.ingest.eventfilestore.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileStore;
 import com.lingniu.ingest.eventhistory.EventHistoryController;
 import com.lingniu.ingest.eventhistory.EventHistoryEnvelopeIngestor;
 import com.lingniu.ingest.eventhistory.Gb32960DecodedFrameService;
--- a/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/ApiExceptionHandlerTest.java
+++ b/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/ApiExceptionHandlerTest.java
@@ -1,7 +1,7 @@
 package com.lingniu.ingest.eventhistory;

-import com.lingniu.ingest.eventfilestore.EventFileStore;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileRecord;
 import com.lingniu.ingest.protocol.gb32960.codec.Gb32960MessageDecoder;
 import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
@@ -93,7 +93,7 @@ class ApiExceptionHandlerTest {
            }

            @Override
-            public List<EventFileRecord> query(com.lingniu.ingest.eventfilestore.EventFileQuery query) {
+            public List<EventFileRecord> query(com.lingniu.ingest.api.history.EventFileQuery query) {
                return List.of();
            }
        };
--- a/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/EventHistoryControllerTest.java
+++ b/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/EventHistoryControllerTest.java
@@ -1,9 +1,9 @@
 package com.lingniu.ingest.eventhistory;

 import com.lingniu.ingest.api.ProtocolId;
-import com.lingniu.ingest.eventfilestore.EventFileQuery;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
-import com.lingniu.ingest.eventfilestore.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileQuery;
+import com.lingniu.ingest.api.history.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileStore;
 import org.junit.jupiter.api.Test;

 import java.io.IOException;
--- a/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/EventHistoryEnvelopeIngestorTest.java
+++ b/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/EventHistoryEnvelopeIngestorTest.java
@@ -6,9 +6,9 @@ import com.lingniu.ingest.api.ProtocolId;
 import com.lingniu.ingest.api.consumer.EnvelopeIngestResult;
 import com.lingniu.ingest.api.consumer.EnvelopeIngestor;
 import com.lingniu.ingest.api.event.RawArchiveKeys;
-import com.lingniu.ingest.eventfilestore.EventFileQuery;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
-import com.lingniu.ingest.eventfilestore.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileQuery;
+import com.lingniu.ingest.api.history.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileStore;
 import com.lingniu.ingest.sink.mq.proto.RawArchiveRef;
 import com.lingniu.ingest.sink.mq.proto.RawFrameFactPayload;
 import com.lingniu.ingest.sink.mq.proto.TelemetryField;
--- a/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/Gb32960DecodedFrameServiceTest.java
+++ b/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/Gb32960DecodedFrameServiceTest.java
@@ -2,9 +2,9 @@ package com.lingniu.ingest.eventhistory;

 import com.lingniu.ingest.api.ProtocolId;
 import com.lingniu.ingest.codec.BccChecksum;
-import com.lingniu.ingest.eventfilestore.EventFileQuery;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
-import com.lingniu.ingest.eventfilestore.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileQuery;
+import com.lingniu.ingest.api.history.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileStore;
 import com.lingniu.ingest.protocol.gb32960.codec.Gb32960BodyParser;
 import com.lingniu.ingest.protocol.gb32960.codec.Gb32960MessageDecoder;
 import com.lingniu.ingest.protocol.gb32960.codec.InfoBlockParser;
--- a/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/TelemetryEnvelopeRecordMapperTest.java
+++ b/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/TelemetryEnvelopeRecordMapperTest.java
@@ -1,7 +1,7 @@
 package com.lingniu.ingest.eventhistory;

 import com.lingniu.ingest.api.ProtocolId;
-import com.lingniu.ingest.eventfilestore.EventFileRecord;
+import com.lingniu.ingest.api.history.EventFileRecord;
 import com.lingniu.ingest.sink.mq.proto.RawArchiveRef;
 import com.lingniu.ingest.sink.mq.proto.TelemetryField;
 import com.lingniu.ingest.sink.mq.proto.TelemetrySnapshot;
--- a/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/config/EventHistoryAutoConfigurationTest.java
+++ b/modules/services/event-history-service/src/test/java/com/lingniu/ingest/eventhistory/config/EventHistoryAutoConfigurationTest.java
@@ -2,7 +2,7 @@ package com.lingniu.ingest.eventhistory.config;

 import com.lingniu.ingest.api.consumer.EnvelopeConsumerProcessor;
 import com.lingniu.ingest.api.consumer.EnvelopeDeadLetterSink;
-import com.lingniu.ingest.eventfilestore.EventFileStore;
+import com.lingniu.ingest.api.history.EventFileStore;
 import com.lingniu.ingest.eventhistory.EventHistoryController;
 import com.lingniu.ingest.eventhistory.EventHistoryEnvelopeIngestor;
 import com.lingniu.ingest.eventhistory.Gb32960DecodedFrameService;