This is an automated email from the ASF dual-hosted git repository.
jnioche pushed a commit to branch 990
in repository https://gitbox.apache.org/repos/asf/stormcrawler.git
The following commit(s) were added to refs/heads/990 by this push:
new 66a716b3 Fix licenses for QueueBolt, add it to crawler.flux and fix
its package name in injection.flux
66a716b3 is described below
commit 66a716b34c2109d5746953e7c3cc678a773a7592
Author: Julien Nioche <[email protected]>
AuthorDate: Sat Oct 11 18:25:37 2025 +0100
Fix licenses for QueueBolt, add it to crawler.flux and fix its package name
in injection.flux
Signed-off-by: Julien Nioche <[email protected]>
---
.../resources/archetype-resources/crawler.flux | 10 ++++++++++
.../resources/archetype-resources/injection.flux | 2 +-
external/opensearch/pom.xml | 8 ++++----
.../opensearch/persistence/QueueBolt.java | 22 ++++++++++++----------
4 files changed, 27 insertions(+), 15 deletions(-)
diff --git
a/external/opensearch/archetype/src/main/resources/archetype-resources/crawler.flux
b/external/opensearch/archetype/src/main/resources/archetype-resources/crawler.flux
index 42121431..09057dc1 100644
---
a/external/opensearch/archetype/src/main/resources/archetype-resources/crawler.flux
+++
b/external/opensearch/archetype/src/main/resources/archetype-resources/crawler.flux
@@ -49,6 +49,9 @@ bolts:
- id: "status_metrics"
className: "org.apache.stormcrawler.opensearch.metrics.StatusMetricsBolt"
parallelism: 1
+ - id: "queues"
+ className: "org.apache.stormcrawler.opensearch.persistence.QueueBolt"
+ parallelism: 1
streams:
- from: "spout"
@@ -139,3 +142,10 @@ streams:
grouping:
type: LOCAL_OR_SHUFFLE
streamId: "deletion"
+
+ - from: "status"
+ to: "queues"
+ grouping:
+ type: FIELDS
+ args: ["key"]
+ streamId: "queue"
diff --git
a/external/opensearch/archetype/src/main/resources/archetype-resources/injection.flux
b/external/opensearch/archetype/src/main/resources/archetype-resources/injection.flux
index 2f66da4e..da926d21 100644
---
a/external/opensearch/archetype/src/main/resources/archetype-resources/injection.flux
+++
b/external/opensearch/archetype/src/main/resources/archetype-resources/injection.flux
@@ -32,7 +32,7 @@ bolts:
parallelism: 1
- id: "queues"
- className:
"com.digitalpebble.stormcrawler.opensearch.persistence.QueueBolt"
+ className: "org.apache.stormcrawler.opensearch.persistence.QueueBolt"
parallelism: 1
streams:
diff --git a/external/opensearch/pom.xml b/external/opensearch/pom.xml
index 888f874b..521291d8 100644
--- a/external/opensearch/pom.xml
+++ b/external/opensearch/pom.xml
@@ -32,12 +32,12 @@ under the License.
<properties>
<opensearch.version>2.19.3</opensearch.version>
<jacoco.haltOnFailure>true</jacoco.haltOnFailure>
- <jacoco.classRatio>0.27</jacoco.classRatio>
- <jacoco.instructionRatio>0.27</jacoco.instructionRatio>
- <jacoco.methodRatio>0.25</jacoco.methodRatio>
+ <jacoco.classRatio>0.25</jacoco.classRatio>
+ <jacoco.instructionRatio>0.26</jacoco.instructionRatio>
+ <jacoco.methodRatio>0.24</jacoco.methodRatio>
<jacoco.branchRatio>0.17</jacoco.branchRatio>
<jacoco.lineRatio>0.29</jacoco.lineRatio>
- <jacoco.complexityRatio>0.13</jacoco.complexityRatio>
+ <jacoco.complexityRatio>0.12</jacoco.complexityRatio>
</properties>
<artifactId>stormcrawler-opensearch</artifactId>
diff --git
a/external/opensearch/src/main/java/org/apache/stormcrawler/opensearch/persistence/QueueBolt.java
b/external/opensearch/src/main/java/org/apache/stormcrawler/opensearch/persistence/QueueBolt.java
index b866c1bf..7baf76fd 100644
---
a/external/opensearch/src/main/java/org/apache/stormcrawler/opensearch/persistence/QueueBolt.java
+++
b/external/opensearch/src/main/java/org/apache/stormcrawler/opensearch/persistence/QueueBolt.java
@@ -1,15 +1,17 @@
-/**
- * Licensed to DigitalPebble Ltd under one or more contributor license
agreements. See the NOTICE
- * file distributed with this work for additional information regarding
copyright ownership.
- * DigitalPebble licenses this file to You under the Apache License, Version
2.0 (the "License");
- * you may not use this file except in compliance with the License. You may
obtain a copy of the
- * License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * <p>Unless required by applicable law or agreed to in writing, software
distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.stormcrawler.opensearch.persistence;
