refactor: remove file-store config from app runtimes

modules/apps/gb32960-ingest-app/src/main/resources/application.yml

@@ -117,8 +117,6 @@ lingniu:
         enabled: ${SINK_ARCHIVE_ENABLED:true}
         type: local
         path: ${SINK_ARCHIVE_PATH:./archive/}
-    event-file-store:
-      enabled: false
     event-history:
       enabled: false
     vehicle-state:

modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java

@@ -48,7 +48,6 @@ class Gb32960IngestAppCompositionTest {
                     "lingniu.ingest.sink.mq.consumer.enabled=false",
                     "lingniu.ingest.sink.archive.enabled=true",
                     "lingniu.ingest.sink.archive.path=target/test-archive-gb32960",
-                    "lingniu.ingest.event-file-store.enabled=false",
                     "lingniu.ingest.event-history.enabled=false",
                     "lingniu.ingest.vehicle-state.enabled=false",
                     "lingniu.ingest.vehicle-stat.enabled=false");

modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java

@@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.io.ClassPathResource;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -11,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 class Gb32960IngestAppDefaultsTest {
 
     @Test
-    void applicationDefaultsKeepGb32960IngestAsTcpKafkaProducerOnly() {
+    void applicationDefaultsKeepGb32960IngestAsTcpKafkaProducerOnly() throws IOException {
         Properties properties = applicationProperties();
 
         assertThat(properties)
@@ -34,12 +36,15 @@ class Gb32960IngestAppDefaultsTest {
                 .containsEntry("lingniu.ingest.identity.store", "${VEHICLE_IDENTITY_STORE:mysql}")
                 .containsEntry("lingniu.ingest.identity.mysql.table-name",
                         "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}")
-                .containsEntry("lingniu.ingest.event-file-store.enabled", false)
                 .containsEntry("lingniu.ingest.event-history.enabled", false)
                 .containsEntry("lingniu.ingest.vehicle-state.enabled", false)
                 .containsEntry("lingniu.ingest.vehicle-stat.enabled", false)
                 .containsEntry("management.endpoints.web.exposure.include",
                         "health,info,metrics,prometheus,env,gb32960sessions");
+
+        assertThat(properties.stringPropertyNames())
+                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."));
+        assertThat(applicationYaml()).doesNotContain("event-file-store:");
     }
 
     private static Properties applicationProperties() {
@@ -51,4 +56,9 @@ class Gb32960IngestAppDefaultsTest {
         assertThat(properties).isNotNull();
         return properties;
     }
+
+    private static String applicationYaml() throws IOException {
+        return new String(new ClassPathResource("application.yml").getInputStream().readAllBytes(),
+                StandardCharsets.UTF_8);
+    }
 }

modules/apps/jt808-ingest-app/src/main/resources/application.yml

@@ -83,8 +83,6 @@ lingniu:
           dlq: ${KAFKA_TOPIC_JT808_DLQ:vehicle.dlq.jt808.v1}
         consumer:
           enabled: false
-    event-file-store:
-      enabled: false
     event-history:
       enabled: false
     vehicle-state:

modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java

@@ -47,7 +47,6 @@ class Jt808IngestAppCompositionTest {
                     "lingniu.ingest.sink.mq.consumer.enabled=false",
                     "lingniu.ingest.sink.archive.enabled=true",
                     "lingniu.ingest.sink.archive.path=target/test-archive-jt808",
-                    "lingniu.ingest.event-file-store.enabled=false",
                     "lingniu.ingest.event-history.enabled=false",
                     "lingniu.ingest.vehicle-state.enabled=false",
                     "lingniu.ingest.vehicle-stat.enabled=false");

modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java

@@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.io.ClassPathResource;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -11,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 class Jt808IngestAppDefaultsTest {
 
     @Test
-    void applicationDefaultsKeepJt808IngestAsTcpKafkaProducerOnly() {
+    void applicationDefaultsKeepJt808IngestAsTcpKafkaProducerOnly() throws IOException {
         Properties properties = applicationProperties();
 
         assertThat(properties)
@@ -41,10 +43,13 @@ class Jt808IngestAppDefaultsTest {
                 .containsEntry("lingniu.ingest.identity.mysql.password", "${VEHICLE_IDENTITY_MYSQL_PASSWORD:}")
                 .containsEntry("lingniu.ingest.identity.mysql.initialize-schema",
                         "${VEHICLE_IDENTITY_MYSQL_INITIALIZE_SCHEMA:true}")
-                .containsEntry("lingniu.ingest.event-file-store.enabled", false)
                 .containsEntry("lingniu.ingest.event-history.enabled", false)
                 .containsEntry("lingniu.ingest.vehicle-state.enabled", false)
                 .containsEntry("lingniu.ingest.vehicle-stat.enabled", false);
+
+        assertThat(properties.stringPropertyNames())
+                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."));
+        assertThat(applicationYaml()).doesNotContain("event-file-store:");
     }
 
     private static Properties applicationProperties() {
@@ -56,4 +61,9 @@ class Jt808IngestAppDefaultsTest {
         assertThat(properties).isNotNull();
         return properties;
     }
+
+    private static String applicationYaml() throws IOException {
+        return new String(new ClassPathResource("application.yml").getInputStream().readAllBytes(),
+                StandardCharsets.UTF_8);
+    }
 }

modules/apps/vehicle-analytics-app/src/main/resources/application.yml

@@ -70,8 +70,6 @@ lingniu:
                 - ${KAFKA_TOPIC_JT808_EVENT:vehicle.event.jt808.v1}
       archive:
         enabled: false
-    event-file-store:
-      enabled: false
     event-history:
       enabled: false
     vehicle-state:

modules/apps/vehicle-analytics-app/src/test/java/com/lingniu/ingest/analyticsapp/VehicleAnalyticsAppCompositionTest.java

@@ -47,7 +47,6 @@ class VehicleAnalyticsAppCompositionTest {
                         "lingniu.ingest.vehicle-state.enabled=false",
                         "lingniu.ingest.vehicle-stat.enabled=true",
                         "lingniu.ingest.vehicle-stat.jt808.enabled=true",
-                        "lingniu.ingest.event-file-store.enabled=false",
                         "lingniu.ingest.event-history.enabled=false",
                         "lingniu.ingest.gb32960.enabled=false")
                 .run(context -> {

modules/apps/vehicle-analytics-app/src/test/java/com/lingniu/ingest/analyticsapp/VehicleAnalyticsAppDefaultsTest.java

@@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.io.ClassPathResource;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -11,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 class VehicleAnalyticsAppDefaultsTest {
 
     @Test
-    void applicationDefaultsKeepAnalyticsAsStatConsumerRuntime() {
+    void applicationDefaultsKeepAnalyticsAsStatConsumerRuntime() throws IOException {
         Properties properties = applicationProperties();
 
         assertThat(properties)
@@ -22,7 +24,6 @@ class VehicleAnalyticsAppDefaultsTest {
                 .containsEntry("spring.cloud.nacos.config.server-addr", "${NACOS_SERVER_ADDR:127.0.0.1:8848}")
                 .containsEntry("lingniu.ingest.gb32960.enabled", false)
                 .containsEntry("lingniu.ingest.sink.archive.enabled", false)
-                .containsEntry("lingniu.ingest.event-file-store.enabled", false)
                 .containsEntry("lingniu.ingest.event-history.enabled", false)
                 .containsEntry("lingniu.ingest.vehicle-stat.enabled", "${VEHICLE_STAT_ENABLED:true}")
                 .containsEntry(
@@ -42,6 +43,10 @@ class VehicleAnalyticsAppDefaultsTest {
                 .containsEntry(
                         "lingniu.ingest.sink.mq.consumer.bindings.vehicleStateEnvelopeConsumerProcessor.group-id",
                         "${KAFKA_GROUP_STATE:vehicle-state}");
+
+        assertThat(properties.stringPropertyNames())
+                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."));
+        assertThat(applicationYaml()).doesNotContain("event-file-store:");
     }
 
     private static Properties applicationProperties() {
@@ -53,4 +58,9 @@ class VehicleAnalyticsAppDefaultsTest {
         assertThat(properties).isNotNull();
         return properties;
     }
+
+    private static String applicationYaml() throws IOException {
+        return new String(new ClassPathResource("application.yml").getInputStream().readAllBytes(),
+                StandardCharsets.UTF_8);
+    }
 }

modules/apps/yutong-mqtt-app/src/main/resources/application.yml

@@ -92,8 +92,6 @@ lingniu:
         enabled: ${SINK_ARCHIVE_ENABLED:true}
         type: local
         path: ${SINK_ARCHIVE_PATH:./archive/}
-    event-file-store:
-      enabled: false
     event-history:
       enabled: false
     vehicle-state:

modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java

@@ -46,7 +46,6 @@ class YutongMqttAppCompositionTest {
                     "lingniu.ingest.sink.mq.consumer.enabled=false",
                     "lingniu.ingest.sink.archive.enabled=true",
                     "lingniu.ingest.sink.archive.path=target/test-archive-yutong",
-                    "lingniu.ingest.event-file-store.enabled=false",
                     "lingniu.ingest.event-history.enabled=false",
                     "lingniu.ingest.vehicle-state.enabled=false",
                     "lingniu.ingest.vehicle-stat.enabled=false");

modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java

@@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.io.ClassPathResource;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -11,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 class YutongMqttAppDefaultsTest {
 
     @Test
-    void applicationDefaultsKeepYutongMqttAsKafkaProducerOnly() {
+    void applicationDefaultsKeepYutongMqttAsKafkaProducerOnly() throws IOException {
         Properties properties = applicationProperties();
 
         assertThat(properties)
@@ -34,10 +36,13 @@ class YutongMqttAppDefaultsTest {
                 .containsEntry("lingniu.ingest.identity.mysql.table-name",
                         "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}")
                 .containsEntry("lingniu.ingest.sink.archive.enabled", "${SINK_ARCHIVE_ENABLED:true}")
-                .containsEntry("lingniu.ingest.event-file-store.enabled", false)
                 .containsEntry("lingniu.ingest.event-history.enabled", false)
                 .containsEntry("lingniu.ingest.vehicle-state.enabled", false)
                 .containsEntry("lingniu.ingest.vehicle-stat.enabled", false);
+
+        assertThat(properties.stringPropertyNames())
+                .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store."));
+        assertThat(applicationYaml()).doesNotContain("event-file-store:");
     }
 
     private static Properties applicationProperties() {
@@ -49,4 +54,9 @@ class YutongMqttAppDefaultsTest {
         assertThat(properties).isNotNull();
         return properties;
     }
+
+    private static String applicationYaml() throws IOException {
+        return new String(new ClassPathResource("application.yml").getInputStream().readAllBytes(),
+                StandardCharsets.UTF_8);
+    }
 }