Refine exception handling for data insertion conflicts to use Crawlin…

…gAccessException
codelibs · Apr 4, 2024 · 143b9d6 · 143b9d6
1 parent cbcf9c5
commit 143b9d6
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...awler-es/src/main/java/org/codelibs/fess/crawler/service/impl/AbstractCrawlerService.java b/...awler-es/src/main/java/org/codelibs/fess/crawler/service/impl/AbstractCrawlerService.java
@@ -44,6 +44,7 @@
 import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.crawler.entity.EsAccessResult;
 import org.codelibs.fess.crawler.entity.EsAccessResultData;
+import org.codelibs.fess.crawler.exception.CrawlingAccessException;
 import org.codelibs.fess.crawler.exception.EsAccessException;
 import org.codelibs.fess.crawler.util.EsResultList;
 import org.joda.time.DateTimeZone;
@@ -69,6 +70,7 @@
 import org.opensearch.cluster.metadata.MappingMetadata;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.query.BoolQueryBuilder;
@@ -230,6 +232,9 @@ protected IndexResponse insert(final Object target, final OpType opType) {
             setId(target, id);
             return response;
         } catch (final OpenSearchStatusException e) {
+            if (e.status() == RestStatus.CONFLICT) {
+                throw new CrawlingAccessException("[" + e.status() + "] Failed to insert " + id, e);
+            }
             throw new EsAccessException("[" + e.status() + "] Failed to insert " + id, e);
         } catch (final Exception e) {
             throw new EsAccessException("Failed to insert " + id, e);