Extract DelegateRefresher to deduplicate JSON resource wrapper logic#1870
Merged
Extract DelegateRefresher to deduplicate JSON resource wrapper logic#1870
Conversation
JSONURLFilterWrapper and JSONResourceWrapper contained near-identical code for loading a delegate class, validating it implements JSONResource, and setting up a periodic refresh timer from OpenSearch. This extracts the shared logic into a generic DelegateRefresher<T> class, reducing each wrapper from ~180 lines to ~75 lines. Adds 8 unit tests for the new class. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Julien Nioche <julien@digitalpebble.com>
rzo1
approved these changes
Apr 6, 2026
external/opensearch/src/main/java/org/apache/stormcrawler/opensearch/DelegateRefresher.java
Outdated
Show resolved
Hide resolved
external/opensearch/src/main/java/org/apache/stormcrawler/opensearch/DelegateRefresher.java
Show resolved
Hide resolved
external/opensearch/src/main/java/org/apache/stormcrawler/opensearch/DelegateRefresher.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Julien Nioche <julien@digitalpebble.com>
5 tasks
dpol1
added a commit
to dpol1/stormcrawler
that referenced
this pull request
Apr 10, 2026
This commit aligns the opensearch-java module with recent legacy updates, completes the migration to HC5/API 3.x, and cleans up duplicated resources. Refactors and Alignment: - Ported DelegateRefresher for dynamic config reloading (apache#1870). - Adopted Storm V2 metrics bridge via CrawlerMetrics (apache#1846). - Aligned log messages and metric scopes to OpenSearch (apache#1871). - Ported WaitAckCache extraction to centralize bulk-ack logic (apache#1869). - Fixed a race condition in IndexerBolt by inverting the execution order, ensuring tuples are registered in waitAck before bulk dispatch. - Refactored BulkItemResponseToFailedFlag to a Java record with a compact constructor for strict null-safety. Maintenance and Cleanup: - Removed duplicated archetype, dashboards, and opensearch-conf.yaml to prevent maintenance overhead. - Updated README with a migration guide pointing to legacy resources. - Removed dead rat-exclude in root pom.xml.
dpol1
added a commit
to dpol1/stormcrawler
that referenced
this pull request
Apr 10, 2026
This commit aligns the opensearch-java module with recent legacy updates, completes the migration to HC5/API 3.x, and cleans up duplicated resources. Refactors and Alignment: - Ported DelegateRefresher for dynamic config reloading (apache#1870). - Adopted Storm V2 metrics bridge via CrawlerMetrics (apache#1846). - Aligned log messages and metric scopes to OpenSearch (apache#1871). - Ported WaitAckCache extraction to centralize bulk-ack logic (apache#1869). - Fixed a race condition in IndexerBolt by inverting the execution order, ensuring tuples are registered in waitAck before bulk dispatch. - Refactored BulkItemResponseToFailedFlag to a Java record with a compact constructor for strict null-safety. Maintenance and Cleanup: - Removed duplicated archetype, dashboards, and opensearch-conf.yaml to prevent maintenance overhead. - Updated README with a migration guide pointing to legacy resources. - Removed dead rat-exclude in root pom.xml.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
JSONURLFilterWrapperandJSONResourceWrapperinto a new genericDelegateRefresher<T>classDelegateRefreshercovering delegate loading for both URLFilter and ParseFilter, error cases (missing config, wrong base type, missing JSONResource), and idempotent cleanupTest plan
mvn test -pl external/opensearch -Dtest=DelegateRefresherTest— all 8 new unit tests passmvn checkstyle:check -pl external/opensearch— 0 violationsmvn compile -pl external/opensearch -am— clean compile🤖 Generated with Claude Code