diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java index 7148d7af8..f84186370 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java @@ -45,6 +45,9 @@ public interface CrawlingConfig { Integer getTimeToLive(); + @Deprecated + Map initializeClientFactory(CrawlerClientFactory crawlerClientFactory); + CrawlerClientFactory initializeClientFactory(Supplier creator); Map getConfigParameterMap(ConfigName name); diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java index fae844f0a..1b67cd0ae 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java @@ -15,6 +15,7 @@ */ package org.codelibs.fess.es.config.exentity; +import java.util.Collections; import java.util.Map; import java.util.function.Supplier; @@ -77,4 +78,10 @@ public class CrawlingConfigWrapper implements CrawlingConfig { public Map getConfigParameterMap(final ConfigName name) { return crawlingConfig.getConfigParameterMap(name); } + + @Override + public Map initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) { + initializeClientFactory(() -> crawlerClientFactory); + return Collections.emptyMap(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java index e4ded8ac5..2b279dd09 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java @@ -414,4 +414,9 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig { + updatedBy + ", updatedTime=" + updatedTime + "]"; } + @Override + public Map initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) { + initializeClientFactory(() -> crawlerClientFactory); + return Collections.emptyMap(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java index 5341a0204..d9a0e8b80 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java @@ -245,4 +245,9 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig { + sortOrder + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + "]"; } + @Override + public Map initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) { + initializeClientFactory(() -> crawlerClientFactory); + return Collections.emptyMap(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java index 0aad56159..780025f80 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java @@ -251,4 +251,9 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig { + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", urls=" + urls + ", userAgent=" + userAgent + "]"; } + @Override + public Map initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) { + initializeClientFactory(() -> crawlerClientFactory); + return Collections.emptyMap(); + } }