diff --git a/src/main/java/at/procon/eventhub/yellowfox/service/NoopYellowFoxD8ExtractionBatchExecutor.java b/src/main/java/at/procon/eventhub/yellowfox/service/NoopYellowFoxD8ExtractionBatchExecutor.java index ebfecbb..34e5188 100644 --- a/src/main/java/at/procon/eventhub/yellowfox/service/NoopYellowFoxD8ExtractionBatchExecutor.java +++ b/src/main/java/at/procon/eventhub/yellowfox/service/NoopYellowFoxD8ExtractionBatchExecutor.java @@ -7,11 +7,9 @@ import at.procon.eventhub.yellowfox.dto.YellowFoxD8ExtractionBatchResultDto; import at.procon.eventhub.yellowfox.dto.YellowFoxD8ImportRequest; import java.util.UUID; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.stereotype.Service; @Service -@ConditionalOnMissingBean(YellowFoxD8ExtractionBatchExecutor.class) @ConditionalOnExpression("!T(org.springframework.util.StringUtils).hasText('${eventhub.yellow-fox.datasource.jdbc-url:}')") public class NoopYellowFoxD8ExtractionBatchExecutor extends AbstractNoopExtractionBatchExecutor diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b6ab787..bdbceb1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -63,7 +63,7 @@ eventhub: # Enables the scheduler that regularly triggers configured tachograph import plans. # Default is safe: no scheduled import starts unless explicitly enabled. - scheduler-enabled: true + scheduler-enabled: false scheduler-poll-interval-ms: 3600000 # PLAN_ONLY creates import_run + planned extraction packages. @@ -78,9 +78,9 @@ eventhub: # Example plan. Keep disabled until the tachograph datasource/extractor is wired. import-plans: - plan-key: kralowetz-tachograph-org-147 - enabled: true + enabled: false cron: "0 15 * * * *" # hourly at minute 15 - tenant-key: kralowetz + tenant-key: event-source: provider-key: TACHOGRAPH source-kind: MIXED @@ -146,17 +146,9 @@ eventhub: source-key: YELLOWFOX_D8 source-instance-key: logistics-db-prod tenant-provider-setting-key: yellowfox-main - source-group: - type: FLEET - source-entity-id: null - code: null - name: null import-scope: type: TENANT_ALL - root-source-organisation: null include-children: false - occurred-from: null - occurred-to: null event-families: - DRIVER_ACTIVITY - DRIVER_CARD @@ -165,6 +157,4 @@ eventhub: initial-strategy: OCCURRED_AT_WINDOW_WITH_OVERLAP scheduled-strategy: SOURCE_ROW_WATERMARK refresh-master-data-first: false - initial-occurred-from: null - initial-occurred-to: null - run-initial-on-startup: false \ No newline at end of file + run-initial-on-startup: false