TriTih
/
eventhub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix YellowFox fallback executor wiring

This commit is contained in:
trifonovt 2026-05-05 15:33:18 +02:00
parent e4e9137af5
commit 094007d817
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/at/procon/eventhub/yellowfox/service/NoopYellowFoxD8ExtractionBatchExecutor.java
View File

@ -7,11 +7,9 @@ import at.procon.eventhub.yellowfox.dto.YellowFoxD8ExtractionBatchResultDto;
import at.procon.eventhub.yellowfox.dto.YellowFoxD8ImportRequest; import at.procon.eventhub.yellowfox.dto.YellowFoxD8ImportRequest;
import java.util.UUID; import java.util.UUID;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
@ConditionalOnMissingBean(YellowFoxD8ExtractionBatchExecutor.class)
@ConditionalOnExpression("!T(org.springframework.util.StringUtils).hasText('${eventhub.yellow-fox.datasource.jdbc-url:}')") @ConditionalOnExpression("!T(org.springframework.util.StringUtils).hasText('${eventhub.yellow-fox.datasource.jdbc-url:}')")
public class NoopYellowFoxD8ExtractionBatchExecutor public class NoopYellowFoxD8ExtractionBatchExecutor
extends AbstractNoopExtractionBatchExecutor<YellowFoxD8ImportRequest, YellowFoxD8ExtractionBatchResultDto> extends AbstractNoopExtractionBatchExecutor<YellowFoxD8ImportRequest, YellowFoxD8ExtractionBatchResultDto>

16
src/main/resources/application.yml
View File

@ -63,7 +63,7 @@ eventhub:
# Enables the scheduler that regularly triggers configured tachograph import plans. # Enables the scheduler that regularly triggers configured tachograph import plans.
# Default is safe: no scheduled import starts unless explicitly enabled. # Default is safe: no scheduled import starts unless explicitly enabled.
scheduler-enabled: true scheduler-enabled: false
scheduler-poll-interval-ms: 3600000 scheduler-poll-interval-ms: 3600000
# PLAN_ONLY creates import_run + planned extraction packages. # PLAN_ONLY creates import_run + planned extraction packages.
@ -78,9 +78,9 @@ eventhub:
# Example plan. Keep disabled until the tachograph datasource/extractor is wired. # Example plan. Keep disabled until the tachograph datasource/extractor is wired.
import-plans: import-plans:
- plan-key: kralowetz-tachograph-org-147 - plan-key: kralowetz-tachograph-org-147
enabled: true enabled: false
cron: "0 15 * * * *" # hourly at minute 15 cron: "0 15 * * * *" # hourly at minute 15
tenant-key: kralowetz tenant-key:
event-source: event-source:
provider-key: TACHOGRAPH provider-key: TACHOGRAPH
source-kind: MIXED source-kind: MIXED
@ -146,17 +146,9 @@ eventhub:
source-key: YELLOWFOX_D8 source-key: YELLOWFOX_D8
source-instance-key: logistics-db-prod source-instance-key: logistics-db-prod
tenant-provider-setting-key: yellowfox-main tenant-provider-setting-key: yellowfox-main
source-group:
type: FLEET
source-entity-id: null
code: null
name: null
import-scope: import-scope:
type: TENANT_ALL type: TENANT_ALL
root-source-organisation: null
include-children: false include-children: false
occurred-from: null
occurred-to: null
event-families: event-families:
- DRIVER_ACTIVITY - DRIVER_ACTIVITY
- DRIVER_CARD - DRIVER_CARD
@ -165,6 +157,4 @@ eventhub:
initial-strategy: OCCURRED_AT_WINDOW_WITH_OVERLAP initial-strategy: OCCURRED_AT_WINDOW_WITH_OVERLAP
scheduled-strategy: SOURCE_ROW_WATERMARK scheduled-strategy: SOURCE_ROW_WATERMARK
refresh-master-data-first: false refresh-master-data-first: false
initial-occurred-from: null
initial-occurred-to: null
run-initial-on-startup: false run-initial-on-startup: false