From 9a2ee658da8ab259203e09857700621dd27febec Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 12 Oct 2024 10:40:57 +0900 Subject: [PATCH] Refactor code: Replace redundant conditions and enhance readability across several classes. --- .../codelibs/fess/crawler/service/impl/EsDataService.java | 4 ++-- .../fess/crawler/service/impl/EsUrlFilterService.java | 4 ++-- .../fess/crawler/service/impl/EsUrlQueueService.java | 4 ++-- .../java/org/codelibs/fess/crawler/CrawlerContext.java | 4 ++-- .../java/org/codelibs/fess/crawler/CrawlerThread.java | 4 ++-- .../fess/crawler/client/ftp/FtpAuthentication.java | 2 +- .../org/codelibs/fess/crawler/client/ftp/FtpClient.java | 2 +- .../codelibs/fess/crawler/client/http/RequestHeader.java | 2 +- .../fess/crawler/container/StandardCrawlerContainer.java | 2 +- .../org/codelibs/fess/crawler/entity/RequestData.java | 4 ++-- .../org/codelibs/fess/crawler/entity/ResponseData.java | 6 +++--- .../codelibs/fess/crawler/extractor/ExtractorBuilder.java | 3 ++- .../fess/crawler/extractor/impl/TikaExtractor.java | 3 +-- .../org/codelibs/fess/crawler/helper/RobotsTxtHelper.java | 2 +- .../org/codelibs/fess/crawler/helper/SitemapsHelper.java | 8 ++++---- .../crawler/interval/impl/DefaultIntervalController.java | 4 +--- .../org/codelibs/fess/crawler/rule/impl/RegexRule.java | 4 ++-- .../fess/crawler/transformer/impl/XmlTransformer.java | 6 +++--- .../fess/crawler/transformer/impl/XpathTransformer.java | 2 +- .../java/org/codelibs/fess/crawler/util/TextUtil.java | 4 ++-- 20 files changed, 36 insertions(+), 38 deletions(-) diff --git a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsDataService.java b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsDataService.java index 5180b481..8656da55 100644 --- a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsDataService.java +++ b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsDataService.java @@ -41,13 +41,13 @@ public class EsDataService extends AbstractCrawlerService implements DataService { public EsDataService(final EsCrawlerConfig crawlerConfig) { - this.index = crawlerConfig.getDataIndex(); + index = crawlerConfig.getDataIndex(); setNumberOfShards(crawlerConfig.getDataShards()); setNumberOfReplicas(crawlerConfig.getDataReplicas()); } public EsDataService(final String name, final String type) { - this.index = name + "." + type; + index = name + "." + type; } @PostConstruct diff --git a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlFilterService.java b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlFilterService.java index 81ade0be..4e2eaa77 100644 --- a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlFilterService.java +++ b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlFilterService.java @@ -54,13 +54,13 @@ public class EsUrlFilterService extends AbstractCrawlerService implements UrlFil protected int maxLoadSize = 10000; public EsUrlFilterService(final EsCrawlerConfig crawlerConfig) { - this.index = crawlerConfig.getFilterIndex(); + index = crawlerConfig.getFilterIndex(); setNumberOfShards(crawlerConfig.getFilterShards()); setNumberOfReplicas(crawlerConfig.getFilterReplicas()); } public EsUrlFilterService(final String name, final String type) { - this.index = name + "." + type; + index = name + "." + type; } @PostConstruct diff --git a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlQueueService.java b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlQueueService.java index 52a29561..6bb2fe36 100644 --- a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlQueueService.java +++ b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlQueueService.java @@ -63,13 +63,13 @@ public class EsUrlQueueService extends AbstractCrawlerService implements UrlQueu protected int maxCrawlingQueueSize = 100; public EsUrlQueueService(final EsCrawlerConfig crawlerConfig) { - this.index = crawlerConfig.getQueueIndex(); + index = crawlerConfig.getQueueIndex(); setNumberOfShards(crawlerConfig.getQueueShards()); setNumberOfReplicas(crawlerConfig.getQueueReplicas()); } public EsUrlQueueService(final String name, final String type) { - this.index = name + "." + type; + index = name + "." + type; } @PostConstruct diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerContext.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerContext.java index 15562636..fc0459aa 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerContext.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerContext.java @@ -80,11 +80,11 @@ public long getAccessCount() { } public long incrementAndGetAccessCount() { - return this.accessCount.incrementAndGet(); + return accessCount.incrementAndGet(); } public long decrementAndGetAccessCount() { - return this.accessCount.decrementAndGet(); + return accessCount.decrementAndGet(); } public CrawlerStatus getStatus() { diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerThread.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerThread.java index 7207d7bf..8df89abb 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerThread.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerThread.java @@ -338,8 +338,8 @@ protected void storeChildUrl(final String childUrl, final String parentUrl, fina } protected boolean isValid(final UrlQueue urlQueue) { - if ((urlQueue == null) || StringUtil.isBlank(urlQueue.getUrl()) - || (crawlerContext.getMaxDepth() >= 0 && urlQueue.getDepth() > crawlerContext.getMaxDepth())) { + if (urlQueue == null || StringUtil.isBlank(urlQueue.getUrl()) + || crawlerContext.getMaxDepth() >= 0 && urlQueue.getDepth() > crawlerContext.getMaxDepth()) { return false; } diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpAuthentication.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpAuthentication.java index 20bd42b5..88b4338d 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpAuthentication.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpAuthentication.java @@ -76,7 +76,7 @@ boolean matches(final String path) { try { final int pos = path.indexOf('/', 6); final URL uri = new URL(pos == -1 ? path : path.substring(0, pos)); - if (!"ftp".equals(uri.getProtocol()) || (StringUtil.isNotBlank(server) && !server.equals(uri.getHost()))) { + if (!"ftp".equals(uri.getProtocol()) || StringUtil.isNotBlank(server) && !server.equals(uri.getHost())) { return false; } int p = uri.getPort(); diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpClient.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpClient.java index 9b1e8af6..5009ecce 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpClient.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpClient.java @@ -502,7 +502,7 @@ protected FTPClient getClient(final FtpInfo info) throws IOException { validateRequest(ftpClient); final FtpAuthentication auth = ftpAuthenticationHolder.get(info.toUrl()); - if ((auth != null) && !ftpClient.login(auth.getUsername(), auth.getPassword())) { + if (auth != null && !ftpClient.login(auth.getUsername(), auth.getPassword())) { throw new CrawlerLoginFailureException("Login Failure: " + auth.getUsername() + " for " + info.toUrl()); } diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/http/RequestHeader.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/http/RequestHeader.java index dc35fd65..db7cc86f 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/http/RequestHeader.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/http/RequestHeader.java @@ -53,7 +53,7 @@ public void setValue(final String value) { } public boolean isValid() { - if (StringUtil.isBlank(name) || (value == null)) { + if (StringUtil.isBlank(name) || value == null) { return false; } diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/container/StandardCrawlerContainer.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/container/StandardCrawlerContainer.java index c27dfbb4..91979158 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/container/StandardCrawlerContainer.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/container/StandardCrawlerContainer.java @@ -177,7 +177,7 @@ protected ComponentDef(final T instance, final Consumer initializer, final St } protected T get() { - final T component = this.instance == null ? ClassUtil.newInstance(cls) : this.instance; + final T component = instance == null ? ClassUtil.newInstance(cls) : instance; final BeanDesc beanDesc = BeanDescFactory.getBeanDesc(component.getClass()); for (final FieldDesc fieldDesc : beanDesc.getFieldDescs()) { final Resource annotation = fieldDesc.getField().getAnnotation(Resource.class); diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/entity/RequestData.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/entity/RequestData.java index e59ca0d2..24be1442 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/entity/RequestData.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/entity/RequestData.java @@ -85,11 +85,11 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final RequestData other = (RequestData) obj; - if (!Objects.equals(metaData, other.metaData) || (method != other.method) || !Objects.equals(url, other.url)) { + if (!Objects.equals(metaData, other.metaData) || method != other.method || !Objects.equals(url, other.url)) { return false; } return true; diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/entity/ResponseData.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/entity/ResponseData.java index 16396c7e..3d9802fe 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/entity/ResponseData.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/entity/ResponseData.java @@ -103,12 +103,12 @@ public InputStream getResponseBody() { } public void setResponseBody(final byte[] responseBody) { - this.responseBodyBytes = responseBody; + responseBodyBytes = responseBody; } public void setResponseBody(final File responseBody, final boolean isTemporary) { - this.responseBodyFile = responseBody; - this.isTemporaryFile = isTemporary; + responseBodyFile = responseBody; + isTemporaryFile = isTemporary; } public String getCharSet() { diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/extractor/ExtractorBuilder.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/extractor/ExtractorBuilder.java index 701a0047..e18f9fa5 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/extractor/ExtractorBuilder.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/extractor/ExtractorBuilder.java @@ -119,7 +119,8 @@ public ExtractData extract() { if (contentLength > maxContentLength) { throw new MaxLengthExceededException( "The content length (" + contentLength + " byte) is over " + maxContentLength + " byte."); - } else if (contentLength == 0) { + } + if (contentLength == 0) { if (logger.isDebugEnabled()) { logger.debug("The content length is 0."); } diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/extractor/impl/TikaExtractor.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/extractor/impl/TikaExtractor.java index 6275d6e4..6cb3a73e 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/extractor/impl/TikaExtractor.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/extractor/impl/TikaExtractor.java @@ -39,7 +39,6 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import java.util.function.BiConsumer; -import java.util.function.BiFunction; import java.util.stream.Collectors; import javax.annotation.PostConstruct; @@ -161,7 +160,7 @@ protected ExtractData getText(final InputStream inputStream, final Map 0)) { + } else if ((value = getValue(SITEMAP_RECORD, line)) != null && value.length() > 0) { robotsTxt.addSitemap(value); } } diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/helper/SitemapsHelper.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/helper/SitemapsHelper.java index 988c3d08..40b726ac 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/helper/SitemapsHelper.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/helper/SitemapsHelper.java @@ -63,8 +63,8 @@ protected boolean isValid(final InputStream in, final boolean recursive) { } final String preloadDate = new String(bytes, Constants.UTF_8); - if ((preloadDate.indexOf("= 0) || (preloadDate.indexOf("= 0) - || (preloadDate.startsWith("http://") || preloadDate.startsWith("https://"))) { + if (preloadDate.indexOf("= 0 || preloadDate.indexOf("= 0 || preloadDate.startsWith("http://") + || preloadDate.startsWith("https://")) { // XML Sitemaps return true; } @@ -240,7 +240,7 @@ public void endElement(final String uri, final String localName, final String qN sitemapUrl.setChangefreq(buf.toString().trim()); buf = null; } - } else if (PRIORITY_ELEMENT.equals(qName) && (buf != null)) { + } else if (PRIORITY_ELEMENT.equals(qName) && buf != null) { sitemapUrl.setPriority(buf.toString().trim()); buf = null; } @@ -315,7 +315,7 @@ public void endElement(final String uri, final String localName, final String qN sitemapFile.setLoc(buf.toString().trim()); buf = null; } - } else if ("lastmod".equals(qName) && (buf != null)) { + } else if ("lastmod".equals(qName) && buf != null) { sitemapFile.setLastmod(buf.toString().trim()); buf = null; } diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/interval/impl/DefaultIntervalController.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/interval/impl/DefaultIntervalController.java index 95508292..17ac5f43 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/interval/impl/DefaultIntervalController.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/interval/impl/DefaultIntervalController.java @@ -33,9 +33,7 @@ public DefaultIntervalController() { } public DefaultIntervalController(final Map params) { - Long millis; - - millis = params.get("delayMillisAfterProcessing"); + Long millis = params.get("delayMillisAfterProcessing"); if (millis != null) { delayMillisAfterProcessing = millis; } diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/rule/impl/RegexRule.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/rule/impl/RegexRule.java index 30b3e2b6..3cd07a03 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/rule/impl/RegexRule.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/rule/impl/RegexRule.java @@ -96,8 +96,8 @@ public void setAllRequired(final boolean allRequired) { @Override public boolean equals(final Object obj) { - if ((obj instanceof final RegexRule rule) - && (allRequired == rule.isAllRequired() && defaultRule == rule.isDefaultRule() && regexMap.equals(rule.regexMap))) { + if (obj instanceof final RegexRule rule && allRequired == rule.isAllRequired() && defaultRule == rule.isDefaultRule() + && regexMap.equals(rule.regexMap)) { return true; } return false; diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/transformer/impl/XmlTransformer.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/transformer/impl/XmlTransformer.java index b2edebec..b7670629 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/transformer/impl/XmlTransformer.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/transformer/impl/XmlTransformer.java @@ -340,7 +340,7 @@ public boolean isTrimSpace() { * @param trimSpace the trimSpace to set */ public void setTrimSpace(final boolean trimSpace) { - this.trimSpaceEnabled = trimSpace; + trimSpaceEnabled = trimSpace; } /** @@ -494,8 +494,8 @@ private String getNamespaceForPrefix(final String prefix, final Node namespaceCo namespace = "http://www.w3.org/XML/1998/namespace"; } else { int type; - while ((null != parent) && (null == namespace) - && (((type = parent.getNodeType()) == Node.ELEMENT_NODE) || (type == Node.ENTITY_REFERENCE_NODE))) { + while (null != parent && null == namespace + && ((type = parent.getNodeType()) == Node.ELEMENT_NODE || type == Node.ENTITY_REFERENCE_NODE)) { if (type == Node.ELEMENT_NODE) { if (parent.getNodeName().indexOf(prefix + ":") == 0) { return parent.getNamespaceURI(); diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/transformer/impl/XpathTransformer.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/transformer/impl/XpathTransformer.java index 4d010a87..d04d45ad 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/transformer/impl/XpathTransformer.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/transformer/impl/XpathTransformer.java @@ -227,7 +227,7 @@ public boolean isTrimSpace() { } public void setTrimSpace(final boolean trimSpace) { - this.trimSpaceEnabled = trimSpace; + trimSpaceEnabled = trimSpace; } public String getCharsetName() { diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/util/TextUtil.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/util/TextUtil.java index 49232242..6e9082f9 100644 --- a/fess-crawler/src/main/java/org/codelibs/fess/crawler/util/TextUtil.java +++ b/fess-crawler/src/main/java/org/codelibs/fess/crawler/util/TextUtil.java @@ -81,7 +81,7 @@ public String execute() { } alphanumSize = 0; symbolSize = 0; - } else if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) { + } else if (c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z') { if (duplicateTermRemoved && symbolSize > 0) { isSpace = removeLastDuplication(buf, symbolSize, isSpace, termCache); } @@ -97,7 +97,7 @@ public String execute() { } isSpace = false; symbolSize = 0; - } else if ((c >= '!' && c <= '/') || (c >= ':' && c <= '@') || (c >= '[' && c <= '`') || (c >= '{' && c <= '~')) { + } else if (c >= '!' && c <= '/' || c >= ':' && c <= '@' || c >= '[' && c <= '`' || c >= '{' && c <= '~') { if (duplicateTermRemoved && alphanumSize > 0) { isSpace = removeLastDuplication(buf, alphanumSize, isSpace, termCache); }