Skip to content
This repository was archived by the owner on Nov 14, 2019. It is now read-only.

Commit c637a8b

Browse files
committed
remove url_validation
1 parent c8deadd commit c637a8b

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed
Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
package org.codelibs.riverweb.crawler;
22

33
import java.util.Date;
4-
import java.util.Map;
54

65
import org.codelibs.fess.crawler.CrawlerThread;
76
import org.codelibs.fess.crawler.client.CrawlerClient;
87
import org.codelibs.fess.crawler.client.EsClient;
98
import org.codelibs.fess.crawler.entity.UrlQueue;
10-
import org.codelibs.riverweb.RiverWeb;
119
import org.codelibs.riverweb.config.RiverConfig;
1210
import org.codelibs.riverweb.config.RiverConfigManager;
1311
import org.codelibs.riverweb.util.ConversionUtil;
14-
import org.codelibs.riverweb.util.ScriptUtils;
1512
import org.elasticsearch.action.search.SearchResponse;
1613
import org.elasticsearch.index.query.QueryBuilders;
1714
import org.elasticsearch.search.SearchHitField;
1815
import org.elasticsearch.search.SearchHits;
1916
import org.elasticsearch.search.sort.SortOrder;
2017
import org.lastaflute.di.core.SingletonLaContainer;
21-
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
2218
import org.slf4j.Logger;
2319
import org.slf4j.LoggerFactory;
2420

@@ -51,26 +47,4 @@ protected boolean isContentUpdated(final CrawlerClient client, final UrlQueue<?>
5147
}
5248
return super.isContentUpdated(client, urlQueue);
5349
}
54-
55-
protected boolean isValid(final UrlQueue<?> urlQueue) {
56-
if (urlQueue == null) {
57-
return false;
58-
}
59-
final RiverConfigManager riverConfigManager = SingletonLaContainer.getComponent(RiverConfigManager.class);
60-
final RiverConfig riverConfig = riverConfigManager.get(urlQueue.getSessionId());
61-
if (riverConfig != null) {
62-
final Map<String, Object> scriptSettings = riverConfig.getScriptSettings();
63-
if (scriptSettings != null) {
64-
Object result = ScriptUtils.execute(scriptSettings, "url_validation", v -> {
65-
v.put("container", SingletonLaContainerFactory.getContainer());
66-
v.put("urlQueue", urlQueue);
67-
v.put("logger", RiverWeb.logger);
68-
});
69-
if (result instanceof Boolean) {
70-
return ((Boolean) result).booleanValue();
71-
}
72-
}
73-
}
74-
return super.isValid(urlQueue);
75-
}
7650
}

0 commit comments

Comments
 (0)