0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-02-15 05:50:00 +09:00
parent 81fd179762
commit 85c7ce59d0
12 changed files with 10 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
View file

@ -45,9 +45,6 @@ public interface CrawlingConfig {
Integer getTimeToLive();
@Deprecated
Map<String, Object> initializeClientFactory(CrawlerClientFactory crawlerClientFactory);
CrawlerClientFactory initializeClientFactory(Supplier<CrawlerClientFactory> creator);
Map<String, String> getConfigParameterMap(ConfigName name);
@ -71,7 +68,7 @@ public interface CrawlingConfig {
public enum ConfigType {
WEB("W"), FILE("F"), DATA("D");
private final String typePrefix;
private String typePrefix;
ConfigType(final String typePrefix) {
this.typePrefix = typePrefix;

7
src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java
View file

@ -15,7 +15,6 @@
*/
package org.codelibs.fess.es.config.exentity;
import java.util.Collections;
import java.util.Map;
import java.util.function.Supplier;
@ -78,10 +77,4 @@ public class CrawlingConfigWrapper implements CrawlingConfig {
public Map<String, String> getConfigParameterMap(final ConfigName name) {
return crawlingConfig.getConfigParameterMap(name);
}
@Override
public Map<String, Object> initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) {
initializeClientFactory(() -> crawlerClientFactory);
return Collections.emptyMap();
}
}

6
src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
View file

@ -413,10 +413,4 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig {
+ ", name=" + name + ", permissions=" + Arrays.toString(permissions) + ", sortOrder=" + sortOrder + ", updatedBy="
+ updatedBy + ", updatedTime=" + updatedTime + "]";
}
@Override
public Map<String, Object> initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) {
initializeClientFactory(() -> crawlerClientFactory);
return Collections.emptyMap();
}
}

6
src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java
View file

@ -244,10 +244,4 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig {
+ ", numOfThread=" + numOfThread + ", paths=" + paths + ", permissions=" + Arrays.toString(permissions) + ", sortOrder="
+ sortOrder + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + "]";
}
@Override
public Map<String, Object> initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) {
initializeClientFactory(() -> crawlerClientFactory);
return Collections.emptyMap();
}
}

6
src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
View file

@ -250,10 +250,4 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig {
+ ", numOfThread=" + numOfThread + ", permissions=" + Arrays.toString(permissions) + ", sortOrder=" + sortOrder
+ ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", urls=" + urls + ", userAgent=" + userAgent + "]";
}
@Override
public Map<String, Object> initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) {
initializeClientFactory(() -> crawlerClientFactory);
return Collections.emptyMap();
}
}

2
src/main/java/org/codelibs/fess/helper/JobHelper.java
View file

@ -189,7 +189,7 @@ public class JobHelper {
}
public void setJobRuntime(LaJobRuntime runtime) {
public void setJobRuntime(final LaJobRuntime runtime) {
jobRuntimeLocal.set(runtime);
}

6
src/main/java/org/codelibs/fess/helper/LanguageHelper.java
View file

@ -123,7 +123,7 @@ public class LanguageHelper {
this.detector = detector;
}
public Script createScript(final Map<String, Object> doc, String code) {
public Script createScript(final Map<String, Object> doc, final String code) {
final StringBuilder buf = new StringBuilder(100);
buf.append(code);
final FessConfig fessConfig = ComponentUtil.getFessConfig();
@ -141,8 +141,8 @@ public class LanguageHelper {
public String getReindexScriptSource() {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
String langField = fessConfig.getIndexFieldLang();
String code =
final String langField = fessConfig.getIndexFieldLang();
final String code =
Arrays.stream(langFields).map(s -> "ctx._source['" + s + "_'+ctx._source." + langField + "]=ctx._source." + s)
.collect(Collectors.joining(";"));
if (logger.isDebugEnabled()) {

6
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -57,7 +57,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configurator;
import org.codelibs.core.exception.IORuntimeException;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.core.misc.Pair;
import org.codelibs.fess.Constants;
import org.codelibs.fess.crawler.util.CharUtil;
@ -397,11 +396,6 @@ public class SystemHelper {
}
}
@Deprecated
public void sleep(final int sec) {
ThreadUtil.sleepQuietly(sec * 1000L);
}
public void addShutdownHook(final Runnable hook) {
shutdownHookList.add(hook);
}

6
src/main/java/org/codelibs/fess/job/CrawlJob.java
View file

@ -83,12 +83,6 @@ public class CrawlJob extends ExecJob {
return this;
}
@Deprecated
public String execute(final JobExecutor jobExecutor) {
jobExecutor(jobExecutor);
return execute();
}
@Override
public String execute() {
// check # of crawler processes

5
src/main/java/org/codelibs/fess/job/ExecJob.java
View file

@ -60,6 +60,11 @@ public abstract class ExecJob {
protected abstract String getExecuteType();
public String execute(final JobExecutor jobExecutor) {
jobExecutor(jobExecutor);
return execute();
}
public ExecJob jobExecutor(final JobExecutor jobExecutor) {
this.jobExecutor = jobExecutor;
return this;

6
src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
View file

@ -56,12 +56,6 @@ public class GenerateThumbnailJob extends ExecJob {
return this;
}
@Deprecated
public String execute(final JobExecutor jobExecutor) {
jobExecutor(jobExecutor);
return execute();
}
@Override
public String execute() {
final StringBuilder resultBuf = new StringBuilder();

6
src/main/java/org/codelibs/fess/job/SuggestJob.java
View file

@ -43,12 +43,6 @@ public class SuggestJob extends ExecJob {
private static final Logger logger = LogManager.getLogger(SuggestJob.class);
@Deprecated
public String execute(final JobExecutor jobExecutor) {
jobExecutor(jobExecutor);
return execute();
}
@Override
public String execute() {
final StringBuilder resultBuf = new StringBuilder();