Bladeren bron

apply code formatter

Shinsuke Sugaya 8 jaren geleden
bovenliggende
commit
3c7773d30e

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java

@@ -77,7 +77,7 @@ public class AdminBackupAction extends FessAdminAction {
             if (fileName.startsWith("system") && fileName.endsWith(".properties")) {
             if (fileName.startsWith("system") && fileName.endsWith(".properties")) {
                 try (final InputStream in = form.bulkFile.getInputStream()) {
                 try (final InputStream in = form.bulkFile.getInputStream()) {
                     ComponentUtil.getSystemProperties().load(in);
                     ComponentUtil.getSystemProperties().load(in);
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     logger.warn("Failed to process system.properties file: " + form.bulkFile.getFileName(), e);
                     logger.warn("Failed to process system.properties file: " + form.bulkFile.getFileName(), e);
                 }
                 }
             } else {
             } else {

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

@@ -58,8 +58,8 @@ import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
 import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
 import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData;
 import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexRequest;

+ 6 - 6
src/main/java/org/codelibs/fess/ds/impl/GitBucketDataStoreImpl.java

@@ -74,12 +74,12 @@ public class GitBucketDataStoreImpl extends AbstractDataStoreImpl {
 
 
         final CrawlingConfig crawlingConfig = new CrawlingConfigWrapper(dataConfig) {
         final CrawlingConfig crawlingConfig = new CrawlingConfigWrapper(dataConfig) {
             @Override
             @Override
-            public Map<String, Object> initializeClientFactory(CrawlerClientFactory crawlerClientFactory) {
+            public Map<String, Object> initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) {
                 final Map<String, Object> paramMap = super.initializeClientFactory(crawlerClientFactory);
                 final Map<String, Object> paramMap = super.initializeClientFactory(crawlerClientFactory);
-                List<RequestHeader> headerList = new ArrayList<>();
-                RequestHeader[] headers = (RequestHeader[]) paramMap.get(HcHttpClient.REQUERT_HEADERS_PROPERTY);
+                final List<RequestHeader> headerList = new ArrayList<>();
+                final RequestHeader[] headers = (RequestHeader[]) paramMap.get(HcHttpClient.REQUERT_HEADERS_PROPERTY);
                 if (headers != null) {
                 if (headers != null) {
-                    for (RequestHeader header : headers) {
+                    for (final RequestHeader header : headers) {
                         headerList.add(header);
                         headerList.add(header);
                     }
                     }
                 }
                 }
@@ -175,7 +175,7 @@ public class GitBucketDataStoreImpl extends AbstractDataStoreImpl {
     }
     }
 
 
     private void storeFileContent(final String rootURL, final String authToken, final String owner, final String name,
     private void storeFileContent(final String rootURL, final String authToken, final String owner, final String name,
-            List<String> roleList, final String path, final CrawlingConfig crawlingConfig, final IndexUpdateCallback callback,
+            final List<String> roleList, final String path, final CrawlingConfig crawlingConfig, final IndexUpdateCallback callback,
             final Map<String, String> paramMap, final Map<String, String> scriptMap, final Map<String, Object> defaultDataMap) {
             final Map<String, String> paramMap, final Map<String, String> scriptMap, final Map<String, Object> defaultDataMap) {
         final String apiUrl = rootURL + "api/v3/repos/" + owner + "/" + name + "/contents/" + path;
         final String apiUrl = rootURL + "api/v3/repos/" + owner + "/" + name + "/contents/" + path;
         final String viewUrl = rootURL + owner + "/" + name + "/blob/master/" + path;
         final String viewUrl = rootURL + owner + "/" + name + "/blob/master/" + path;
@@ -199,7 +199,7 @@ public class GitBucketDataStoreImpl extends AbstractDataStoreImpl {
     }
     }
 
 
     protected void collectFileNames(final String rootURL, final String authToken, final String owner, final String name, final String path,
     protected void collectFileNames(final String rootURL, final String authToken, final String owner, final String name, final String path,
-            final int depth, final long readInterval, Consumer<String> consumer) {
+            final int depth, final long readInterval, final Consumer<String> consumer) {
 
 
         if (MAX_DEPTH <= depth) {
         if (MAX_DEPTH <= depth) {
             return;
             return;

+ 4 - 4
src/main/java/org/codelibs/fess/entity/PingResponse.java

@@ -21,13 +21,13 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 
 
 public class PingResponse {
 public class PingResponse {
-    private int status;
+    private final int status;
 
 
-    private List<String> failures;
+    private final List<String> failures;
 
 
-    private String clusterName;
+    private final String clusterName;
 
 
-    private String clusterStatus;
+    private final String clusterStatus;
 
 
     public PingResponse(final ClusterHealthResponse response) {
     public PingResponse(final ClusterHealthResponse response) {
         status = response.getStatus() == ClusterHealthStatus.RED ? 1 : 0;
         status = response.getStatus() == ClusterHealthStatus.RED ? 1 : 0;

+ 1 - 1
src/main/java/org/codelibs/fess/es/config/exentity/AccessToken.java

@@ -50,7 +50,7 @@ public class AccessToken extends BsAccessToken {
         return new Date(getExpiredTime().longValue());
         return new Date(getExpiredTime().longValue());
     }
     }
 
 
-    public void setExpires(Date date) {
+    public void setExpires(final Date date) {
         setExpiredTime(date != null ? date.getTime() : null);
         setExpiredTime(date != null ? date.getTime() : null);
     }
     }
 
 

+ 14 - 4
src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java

@@ -21,49 +21,59 @@ import org.codelibs.fess.crawler.client.CrawlerClientFactory;
 
 
 public class CrawlingConfigWrapper implements CrawlingConfig {
 public class CrawlingConfigWrapper implements CrawlingConfig {
 
 
-    private CrawlingConfig crawlingConfig;
+    private final CrawlingConfig crawlingConfig;
 
 
     public CrawlingConfigWrapper(final CrawlingConfig crawlingConfig) {
     public CrawlingConfigWrapper(final CrawlingConfig crawlingConfig) {
         this.crawlingConfig = crawlingConfig;
         this.crawlingConfig = crawlingConfig;
     }
     }
 
 
+    @Override
     public String getId() {
     public String getId() {
         return crawlingConfig.getId();
         return crawlingConfig.getId();
     }
     }
 
 
+    @Override
     public String getName() {
     public String getName() {
         return crawlingConfig.getName();
         return crawlingConfig.getName();
     }
     }
 
 
+    @Override
     public String[] getPermissions() {
     public String[] getPermissions() {
         return crawlingConfig.getPermissions();
         return crawlingConfig.getPermissions();
     }
     }
 
 
+    @Override
     public String[] getLabelTypeValues() {
     public String[] getLabelTypeValues() {
         return crawlingConfig.getLabelTypeValues();
         return crawlingConfig.getLabelTypeValues();
     }
     }
 
 
+    @Override
     public String getDocumentBoost() {
     public String getDocumentBoost() {
         return crawlingConfig.getDocumentBoost();
         return crawlingConfig.getDocumentBoost();
     }
     }
 
 
-    public String getIndexingTarget(String input) {
+    @Override
+    public String getIndexingTarget(final String input) {
         return crawlingConfig.getIndexingTarget(input);
         return crawlingConfig.getIndexingTarget(input);
     }
     }
 
 
+    @Override
     public String getConfigId() {
     public String getConfigId() {
         return crawlingConfig.getConfigId();
         return crawlingConfig.getConfigId();
     }
     }
 
 
+    @Override
     public Integer getTimeToLive() {
     public Integer getTimeToLive() {
         return crawlingConfig.getTimeToLive();
         return crawlingConfig.getTimeToLive();
     }
     }
 
 
-    public Map<String, Object> initializeClientFactory(CrawlerClientFactory crawlerClientFactory) {
+    @Override
+    public Map<String, Object> initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) {
         return crawlingConfig.initializeClientFactory(crawlerClientFactory);
         return crawlingConfig.initializeClientFactory(crawlerClientFactory);
     }
     }
 
 
-    public Map<String, String> getConfigParameterMap(ConfigName name) {
+    @Override
+    public Map<String, String> getConfigParameterMap(final ConfigName name) {
         return crawlingConfig.getConfigParameterMap(name);
         return crawlingConfig.getConfigParameterMap(name);
     }
     }
 }
 }

+ 1 - 1
src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -317,7 +317,7 @@ public class SystemHelper {
         this.random = random;
         this.random = random;
     }
     }
 
 
-    public boolean isChangedClusterState(int status) {
+    public boolean isChangedClusterState(final int status) {
         return previousClusterState.getAndSet(status) != status;
         return previousClusterState.getAndSet(status) != status;
     }
     }
 
 

+ 3 - 3
src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java

@@ -118,7 +118,7 @@ public class ThumbnailManager {
             final List<Tuple3<String, String, String>> taskList = new ArrayList<>();
             final List<Tuple3<String, String, String>> taskList = new ArrayList<>();
             while (generating) {
             while (generating) {
                 try {
                 try {
-                    Tuple3<String, String, String> task = thumbnailTaskQueue.poll(thumbnailTaskQueueTimeout, TimeUnit.MILLISECONDS);
+                    final Tuple3<String, String, String> task = thumbnailTaskQueue.poll(thumbnailTaskQueueTimeout, TimeUnit.MILLISECONDS);
                     if (task == null) {
                     if (task == null) {
                         if (!taskList.isEmpty()) {
                         if (!taskList.isEmpty()) {
                             storeQueue(taskList);
                             storeQueue(taskList);
@@ -166,7 +166,7 @@ public class ThumbnailManager {
         final List<ThumbnailQueue> list = new ArrayList<>();
         final List<ThumbnailQueue> list = new ArrayList<>();
         taskList.stream().filter(entity -> entity != null).forEach(task -> {
         taskList.stream().filter(entity -> entity != null).forEach(task -> {
             for (final String target : targets) {
             for (final String target : targets) {
-                ThumbnailQueue entity = new ThumbnailQueue();
+                final ThumbnailQueue entity = new ThumbnailQueue();
                 entity.setGenerator(task.getValue1());
                 entity.setGenerator(task.getValue1());
                 entity.setUrl(task.getValue2());
                 entity.setUrl(task.getValue2());
                 entity.setPath(task.getValue3());
                 entity.setPath(task.getValue3());
@@ -229,7 +229,7 @@ public class ThumbnailManager {
             if (generator.isTarget(docMap)) {
             if (generator.isTarget(docMap)) {
                 final String url = DocumentUtil.getValue(docMap, fessConfig.getIndexFieldUrl(), String.class);
                 final String url = DocumentUtil.getValue(docMap, fessConfig.getIndexFieldUrl(), String.class);
                 final String path = getImageFilename(docMap);
                 final String path = getImageFilename(docMap);
-                Tuple3<String, String, String> task = new Tuple3<String, String, String>(generator.getName(), url, path);
+                final Tuple3<String, String, String> task = new Tuple3<>(generator.getName(), url, path);
                 thumbnailTaskQueue.offer(task);
                 thumbnailTaskQueue.offer(task);
                 break;
                 break;
             }
             }

+ 2 - 1
src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java

@@ -105,11 +105,12 @@ public abstract class BaseThumbnailGenerator implements ThumbnailGenerator {
         this.generatorList = generatorList;
         this.generatorList = generatorList;
     }
     }
 
 
+    @Override
     public String getName() {
     public String getName() {
         return name;
         return name;
     }
     }
 
 
-    public void setName(String name) {
+    public void setName(final String name) {
         this.name = name;
         this.name = name;
     }
     }
 
 

+ 2 - 2
src/main/java/org/codelibs/fess/thumbnail/impl/WebDriverGenerator.java

@@ -139,7 +139,7 @@ public class WebDriverGenerator extends BaseThumbnailGenerator {
                     final File thumbnail = ((TakesScreenshot) webDriver).getScreenshotAs(OutputType.FILE);
                     final File thumbnail = ((TakesScreenshot) webDriver).getScreenshotAs(OutputType.FILE);
                     convert(thumbnail, outputFile);
                     convert(thumbnail, outputFile);
                     return true;
                     return true;
-                } catch (UnreachableBrowserException e) {
+                } catch (final UnreachableBrowserException e) {
                     if (logger.isDebugEnabled()) {
                     if (logger.isDebugEnabled()) {
                         logger.debug("WebDriver is not available.", e);
                         logger.debug("WebDriver is not available.", e);
                     }
                     }
@@ -265,7 +265,7 @@ public class WebDriverGenerator extends BaseThumbnailGenerator {
         this.thumbnailHeight = thumbnailHeight;
         this.thumbnailHeight = thumbnailHeight;
     }
     }
 
 
-    public void setUnreachableCheckInterval(long unreachableCheckInterval) {
+    public void setUnreachableCheckInterval(final long unreachableCheckInterval) {
         this.unreachableCheckInterval = unreachableCheckInterval;
         this.unreachableCheckInterval = unreachableCheckInterval;
     }
     }
 }
 }