Browse Source

update license year and code style

Shinsuke Sugaya 8 năm trước cách đây
mục cha
commit
543edd7903
100 tập tin đã thay đổi với 143 bổ sung135 xóa
  1. 1 1
      pom.xml
  2. 1 1
      src/main/java/org/codelibs/fess/Constants.java
  3. 1 1
      src/main/java/org/codelibs/fess/FessBoot.java
  4. 1 1
      src/main/java/org/codelibs/fess/api/BaseApiManager.java
  5. 1 1
      src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java
  6. 1 1
      src/main/java/org/codelibs/fess/api/WebApiManager.java
  7. 1 1
      src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java
  8. 1 1
      src/main/java/org/codelibs/fess/api/WebApiRequest.java
  9. 1 1
      src/main/java/org/codelibs/fess/api/WebApiResponse.java
  10. 4 4
      src/main/java/org/codelibs/fess/api/es/EsApiManager.java
  11. 1 1
      src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java
  12. 2 2
      src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
  13. 1 1
      src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
  14. 1 1
      src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
  15. 1 1
      src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java
  16. 1 1
      src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java
  17. 1 1
      src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java
  18. 1 1
      src/main/java/org/codelibs/fess/app/pager/BadWordPager.java
  19. 1 1
      src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java
  20. 1 1
      src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java
  21. 1 1
      src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java
  22. 1 1
      src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java
  23. 1 1
      src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java
  24. 1 1
      src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java
  25. 1 1
      src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java
  26. 1 1
      src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java
  27. 1 1
      src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java
  28. 1 1
      src/main/java/org/codelibs/fess/app/pager/GroupPager.java
  29. 1 1
      src/main/java/org/codelibs/fess/app/pager/JobLogPager.java
  30. 1 1
      src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java
  31. 1 1
      src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java
  32. 1 1
      src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java
  33. 1 1
      src/main/java/org/codelibs/fess/app/pager/PathMapPager.java
  34. 1 1
      src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java
  35. 1 1
      src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java
  36. 1 1
      src/main/java/org/codelibs/fess/app/pager/RolePager.java
  37. 1 1
      src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java
  38. 1 1
      src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java
  39. 1 1
      src/main/java/org/codelibs/fess/app/pager/SeunjeonPager.java
  40. 1 1
      src/main/java/org/codelibs/fess/app/pager/SynonymPager.java
  41. 1 1
      src/main/java/org/codelibs/fess/app/pager/UserPager.java
  42. 1 1
      src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java
  43. 1 1
      src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java
  44. 1 1
      src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
  45. 1 1
      src/main/java/org/codelibs/fess/app/service/BadWordService.java
  46. 1 1
      src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
  47. 1 1
      src/main/java/org/codelibs/fess/app/service/CharMappingService.java
  48. 1 1
      src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
  49. 1 1
      src/main/java/org/codelibs/fess/app/service/DataConfigService.java
  50. 1 1
      src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
  51. 1 1
      src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
  52. 1 1
      src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
  53. 1 1
      src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java
  54. 1 1
      src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
  55. 1 1
      src/main/java/org/codelibs/fess/app/service/FileConfigService.java
  56. 1 1
      src/main/java/org/codelibs/fess/app/service/GroupService.java
  57. 1 1
      src/main/java/org/codelibs/fess/app/service/JobLogService.java
  58. 1 1
      src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
  59. 1 1
      src/main/java/org/codelibs/fess/app/service/KuromojiService.java
  60. 1 1
      src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
  61. 1 1
      src/main/java/org/codelibs/fess/app/service/PathMappingService.java
  62. 1 1
      src/main/java/org/codelibs/fess/app/service/ProtwordsService.java
  63. 1 1
      src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
  64. 1 1
      src/main/java/org/codelibs/fess/app/service/RoleService.java
  65. 1 1
      src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
  66. 1 1
      src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
  67. 1 1
      src/main/java/org/codelibs/fess/app/service/SearchLogService.java
  68. 40 32
      src/main/java/org/codelibs/fess/app/service/SearchService.java
  69. 1 1
      src/main/java/org/codelibs/fess/app/service/SeunjeonService.java
  70. 1 1
      src/main/java/org/codelibs/fess/app/service/SynonymService.java
  71. 1 1
      src/main/java/org/codelibs/fess/app/service/UserInfoService.java
  72. 1 1
      src/main/java/org/codelibs/fess/app/service/UserService.java
  73. 1 1
      src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
  74. 1 1
      src/main/java/org/codelibs/fess/app/service/WebConfigService.java
  75. 1 1
      src/main/java/org/codelibs/fess/app/web/CrudMode.java
  76. 1 1
      src/main/java/org/codelibs/fess/app/web/RootAction.java
  77. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
  78. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
  79. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java
  80. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java
  81. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/accesstoken/SearchForm.java
  82. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
  83. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/backup/UploadForm.java
  84. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
  85. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java
  86. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/badword/DownloadForm.java
  87. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java
  88. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/badword/SearchForm.java
  89. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java
  90. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
  91. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java
  92. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java
  93. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java
  94. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
  95. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java
  96. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/SearchForm.java
  97. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java
  98. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
  99. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
  100. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java

+ 1 - 1
pom.xml

@@ -175,7 +175,7 @@
 				<configuration>
 				<configuration>
 					<header>http://www.codelibs.org/assets/license/header.txt</header>
 					<header>http://www.codelibs.org/assets/license/header.txt</header>
 					<properties>
 					<properties>
-						<year>2016</year>
+						<year>2017</year>
 					</properties>
 					</properties>
 					<includes>
 					<includes>
 						<include>src/**/*.java</include>
 						<include>src/**/*.java</include>

+ 1 - 1
src/main/java/org/codelibs/fess/Constants.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/FessBoot.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/api/BaseApiManager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/api/WebApiManager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/api/WebApiRequest.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/api/WebApiResponse.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 4 - 4
src/main/java/org/codelibs/fess/api/es/EsApiManager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
@@ -153,7 +153,7 @@ public class EsApiManager extends BaseApiManager {
 }       );
 }       );
     }
     }
 
 
-    private void processPluginRequest(HttpServletRequest request, HttpServletResponse response, String path) {
+    private void processPluginRequest(final HttpServletRequest request, final HttpServletResponse response, final String path) {
         Path filePath = ResourceUtil.getSitePath(path.replaceAll("\\.\\.+", StringUtil.EMPTY).replaceAll("/+", "/").split("/"));
         Path filePath = ResourceUtil.getSitePath(path.replaceAll("\\.\\.+", StringUtil.EMPTY).replaceAll("/+", "/").split("/"));
         if (Files.isDirectory(filePath)) {
         if (Files.isDirectory(filePath)) {
             filePath = filePath.resolve("index.html");
             filePath = filePath.resolve("index.html");
@@ -164,7 +164,7 @@ public class EsApiManager extends BaseApiManager {
                 CopyUtil.copy(in, out);
                 CopyUtil.copy(in, out);
             } catch (final ClientAbortException e) {
             } catch (final ClientAbortException e) {
                 logger.debug("Client aborts this request.", e);
                 logger.debug("Client aborts this request.", e);
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 logger.error("Failed to read " + path + " from " + filePath);
                 logger.error("Failed to read " + path + " from " + filePath);
                 throw new WebApiException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
                 throw new WebApiException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
             }
             }
@@ -173,7 +173,7 @@ public class EsApiManager extends BaseApiManager {
                 response.sendError(HttpServletResponse.SC_NOT_FOUND, path + " is not found.");
                 response.sendError(HttpServletResponse.SC_NOT_FOUND, path + " is not found.");
             } catch (final ClientAbortException e) {
             } catch (final ClientAbortException e) {
                 logger.debug("Client aborts this request.", e);
                 logger.debug("Client aborts this request.", e);
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 logger.error("Failed to read " + path + " from " + filePath);
                 logger.error("Failed to read " + path + " from " + filePath);
                 throw new WebApiException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
                 throw new WebApiException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
             }
             }

+ 1 - 1
src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 2 - 2
src/main/java/org/codelibs/fess/api/json/JsonApiManager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
@@ -283,7 +283,7 @@ public class JsonApiManager extends BaseJsonApiManager {
             return "Unknown";
             return "Unknown";
         }
         }
         if (t.getCause() != null) {
         if (t.getCause() != null) {
-            StringBuilder sb = new StringBuilder();
+            final StringBuilder sb = new StringBuilder();
             while (t != null) {
             while (t != null) {
                 sb.append(t.getClass().getSimpleName());
                 sb.append(t.getClass().getSimpleName());
                 if (t.getMessage() != null) {
                 if (t.getMessage() != null) {

+ 1 - 1
src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/BadWordPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/GroupPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/JobLogPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/PathMapPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/RolePager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/SeunjeonPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/SynonymPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/UserPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/AccessTokenService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/BadWordService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/CharMappingService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/DataConfigService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/ElevateWordService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/FailureUrlService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/FileConfigService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/GroupService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/JobLogService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/KeyMatchService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/KuromojiService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/LabelTypeService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/PathMappingService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/ProtwordsService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/RoleService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/RoleTypeService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/SearchLogService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 40 - 32
src/main/java/org/codelibs/fess/app/service/SearchService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
@@ -216,42 +216,50 @@ public class SearchService {
 
 
     public OptionalEntity<Map<String, Object>> getDocumentByDocId(final String docId, final String[] fields,
     public OptionalEntity<Map<String, Object>> getDocumentByDocId(final String docId, final String[] fields,
             final OptionalThing<FessUserBean> userBean) {
             final OptionalThing<FessUserBean> userBean) {
-        return fessEsClient.getDocument(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(), builder -> {
-            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().must(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
-            final Set<String> roleSet = ComponentUtil.getRoleQueryHelper().build(SearchRequestType.JSON); // TODO SearchRequestType?
-                if (!roleSet.isEmpty()) {
-                    final BoolQueryBuilder roleQuery = QueryBuilders.boolQuery();
-                    roleSet.stream().forEach(name -> {
-                        roleQuery.should(QueryBuilders.termQuery(fessConfig.getIndexFieldRole(), name));
-                    });
-                    boolQuery.filter(roleQuery);
-                }
-                builder.setQuery(boolQuery);
-                builder.setFetchSource(fields, null);
-                fessConfig.processSearchPreference(builder, userBean);
-                return true;
-            });
+        return fessEsClient.getDocument(
+                fessConfig.getIndexDocumentSearchIndex(),
+                fessConfig.getIndexDocumentType(),
+                builder -> {
+                    final BoolQueryBuilder boolQuery =
+                            QueryBuilders.boolQuery().must(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
+                    final Set<String> roleSet = ComponentUtil.getRoleQueryHelper().build(SearchRequestType.JSON); // TODO SearchRequestType?
+                    if (!roleSet.isEmpty()) {
+                        final BoolQueryBuilder roleQuery = QueryBuilders.boolQuery();
+                        roleSet.stream().forEach(name -> {
+                            roleQuery.should(QueryBuilders.termQuery(fessConfig.getIndexFieldRole(), name));
+                        });
+                        boolQuery.filter(roleQuery);
+                    }
+                    builder.setQuery(boolQuery);
+                    builder.setFetchSource(fields, null);
+                    fessConfig.processSearchPreference(builder, userBean);
+                    return true;
+                });
 
 
     }
     }
 
 
     public List<Map<String, Object>> getDocumentListByDocIds(final String[] docIds, final String[] fields,
     public List<Map<String, Object>> getDocumentListByDocIds(final String[] docIds, final String[] fields,
             final OptionalThing<FessUserBean> userBean) {
             final OptionalThing<FessUserBean> userBean) {
-        return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(), builder -> {
-            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery().must(QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIds));
-            final Set<String> roleSet = ComponentUtil.getRoleQueryHelper().build(SearchRequestType.JSON); // TODO SearchRequestType?
-                if (!roleSet.isEmpty()) {
-                    final BoolQueryBuilder roleQuery = QueryBuilders.boolQuery();
-                    roleSet.stream().forEach(name -> {
-                        roleQuery.should(QueryBuilders.termQuery(fessConfig.getIndexFieldRole(), name));
-                    });
-                    boolQuery.filter(roleQuery);
-                }
-                builder.setQuery(boolQuery);
-                builder.setSize(fessConfig.getPagingSearchPageMaxSizeAsInteger().intValue());
-                builder.setFetchSource(fields, null);
-                fessConfig.processSearchPreference(builder, userBean);
-                return true;
-            });
+        return fessEsClient.getDocumentList(
+                fessConfig.getIndexDocumentSearchIndex(),
+                fessConfig.getIndexDocumentType(),
+                builder -> {
+                    final BoolQueryBuilder boolQuery =
+                            QueryBuilders.boolQuery().must(QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIds));
+                    final Set<String> roleSet = ComponentUtil.getRoleQueryHelper().build(SearchRequestType.JSON); // TODO SearchRequestType?
+                    if (!roleSet.isEmpty()) {
+                        final BoolQueryBuilder roleQuery = QueryBuilders.boolQuery();
+                        roleSet.stream().forEach(name -> {
+                            roleQuery.should(QueryBuilders.termQuery(fessConfig.getIndexFieldRole(), name));
+                        });
+                        boolQuery.filter(roleQuery);
+                    }
+                    builder.setQuery(boolQuery);
+                    builder.setSize(fessConfig.getPagingSearchPageMaxSizeAsInteger().intValue());
+                    builder.setFetchSource(fields, null);
+                    fessConfig.processSearchPreference(builder, userBean);
+                    return true;
+                });
     }
     }
 
 
     public boolean update(final String id, final String field, final Object value) {
     public boolean update(final String id, final String field, final Object value) {

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/SeunjeonService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/SynonymService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/UserInfoService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/UserService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/service/WebConfigService.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/CrudMode.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/RootAction.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/accesstoken/SearchForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/badword/DownloadForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/badword/SearchForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/SearchForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright 2012-2016 CodeLibs Project and the Others.
+ * Copyright 2012-2017 CodeLibs Project and the Others.
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác