fess-parent 14.19.0-SNAPSHOT

dbflute.xml

@@ -2,7 +2,7 @@
 <project name="dbflute" basedir=".">
 	<property name="mydbflute.dir" value="${basedir}/mydbflute" />
 	<property name="target.dir" value="${basedir}/target" />
-	<property name="branch.name" value="fess-14.17" />
+	<property name="branch.name" value="fess-14.18" />
 	<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
 
 	<target name="mydbflute.check">

module.xml

@@ -6,7 +6,7 @@
 	<!-- Maven Repository -->
 	<property name="maven.snapshot.repo.url" value="https://maven.codelibs.org/" />
 	<property name="maven.release.repo.url" value="https://maven.codelibs.org/" />
-	<property name="opensearch.version" value="2.17.0" />
+	<property name="opensearch.version" value="2.18.0" />
 
 	<target name="install.modules">
 		<mkdir dir="${target.dir}" />

plugin.xml

@@ -17,8 +17,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-extension" />
-			<param name="plugin.version" value="2.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
@@ -26,8 +26,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="2.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
@@ -35,8 +35,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="2.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
@@ -44,8 +44,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="2.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>
 
 		<antcall target="remove.jars" />

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>fess</artifactId>
-	<version>14.18.0-SNAPSHOT</version>
+	<version>14.19.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>Fess</name>
 	<description>Fess is Full tExt Search System.</description>
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.codelibs.fess</groupId>
 		<artifactId>fess-parent</artifactId>
-		<version>14.18.0-SNAPSHOT</version>
+		<version>14.19.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 	<properties>

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

@@ -126,6 +126,8 @@ public class AdminUpgradeAction extends FessAdminAction {
 
     private static final String VERSION_14_16 = "14.16";
 
+    private static final String VERSION_14_17 = "14.17";
+
     // ===================================================================================
     //                                                                           Attribute
     //
@@ -227,6 +229,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -272,6 +275,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -316,6 +320,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -359,6 +364,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -401,6 +407,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -442,6 +449,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -482,6 +490,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -521,6 +530,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -559,6 +569,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -596,6 +607,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -632,6 +644,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -666,6 +679,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -699,6 +713,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -731,6 +746,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -762,6 +778,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -793,6 +810,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -823,6 +841,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -852,6 +871,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -880,6 +900,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -907,6 +928,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -933,6 +955,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -958,6 +981,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -982,6 +1006,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1005,6 +1030,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1027,6 +1053,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1048,6 +1075,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1068,6 +1096,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1087,6 +1116,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1105,6 +1135,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1122,6 +1153,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1138,6 +1170,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1153,6 +1186,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1167,6 +1201,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_14();
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1180,6 +1215,7 @@ public class AdminUpgradeAction extends FessAdminAction {
             try {
                 upgradeFrom14_15();
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1192,6 +1228,7 @@ public class AdminUpgradeAction extends FessAdminAction {
         } else if (VERSION_14_16.equals(form.targetVersion)) {
             try {
                 upgradeFrom14_16();
+                upgradeFrom14_17();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1201,6 +1238,18 @@ public class AdminUpgradeAction extends FessAdminAction {
                 logger.warn("Failed to upgrade data.", e);
                 saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_16, e.getLocalizedMessage()));
             }
+        } else if (VERSION_14_17.equals(form.targetVersion)) {
+            try {
+                upgradeFrom14_17();
+                upgradeFromAll();
+
+                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
+
+                systemHelper.reloadConfiguration();
+            } catch (final Exception e) {
+                logger.warn("Failed to upgrade data.", e);
+                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_17, e.getLocalizedMessage()));
+            }
         } else {
             saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
         }
@@ -1440,6 +1489,10 @@ public class AdminUpgradeAction extends FessAdminAction {
         // nothing
     }
 
+    private void upgradeFrom14_17() {
+        // nothing
+    }
+
     private String[] getDictionaryPaths() {
         try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("size", "1000").execute()) {
             if (response.getHttpStatusCode() == 200) {

src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java

@@ -187,7 +187,9 @@ public interface FessTransformer {
                 u = u.substring(0, idx);
             }
         }
-        u = decodeUrlAsName(u, u.startsWith("file:"));
+        if (!u.startsWith("smb:") && !u.startsWith("smb1:") && !u.startsWith("ftp:")) {
+            u = decodeUrlAsName(u, u.startsWith("file:"));
+        }
         idx = u.lastIndexOf('/');
         if (idx >= 0) {
             if (u.length() > idx + 1) {

src/main/java/org/codelibs/fess/helper/SearchLogHelper.java

@@ -105,12 +105,16 @@ public class SearchLogHelper {
 
     public void addSearchLog(final SearchRequestParams params, final LocalDateTime requestedTime, final String queryId, final String query,
             final int pageStart, final int pageSize, final QueryResponseList queryResponseList) {
+        final FessConfig fessConfig = ComponentUtil.getFessConfig();
+        if (searchLogQueue.size() > fessConfig.getLoggingSearchMaxQueueSizeAsInteger()) {
+            logger.warn("[{}] The search log queue size is too large. Skipped the search log: {}", queryId, query);
+            return;
+        }
 
         final RoleQueryHelper roleQueryHelper = ComponentUtil.getRoleQueryHelper();
         final UserInfoHelper userInfoHelper = ComponentUtil.getUserInfoHelper();
         final SearchLog searchLog = new SearchLog();
 
-        final FessConfig fessConfig = ComponentUtil.getFessConfig();
         if (fessConfig.isUserInfo()) {
             final String userCode = userInfoHelper.getUserCode();
             if (userCode != null) {
@@ -199,6 +203,11 @@ public class SearchLogHelper {
     }
 
     public void addClickLog(final ClickLog clickLog) {
+        final FessConfig fessConfig = ComponentUtil.getFessConfig();
+        if (clickLogQueue.size() > fessConfig.getLoggingClickMaxQueueSizeAsInteger()) {
+            logger.warn("[{}] The click log queue size is too large. Skipped the click log: {} {}", clickLog);
+            return;
+        }
         clickLogQueue.add(clickLog);
     }
 

src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -135,7 +135,7 @@ public class SystemHelper {
             logger.debug("Initialize {}", this.getClass().getSimpleName());
         }
         final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        cal.set(2026, 3 - 1, 1); // EOL Date
+        cal.set(2026, 6 - 1, 1); // EOL Date
         eolTime = cal.getTimeInMillis();
         if (isEoled()) {
             logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");

src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java

@@ -1197,6 +1197,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /** The key of the configuration. e.g. 60000 */
     String INDEX_BACKUP_LOG_LOAD_TIMEOUT = "index.backup.log.load.timeout";
 
+    /** The key of the configuration. e.g. org.codelibs,org.dbflute,org.lastaflute */
+    String LOGGING_APP_PACKAGES = "logging.app.packages";
+
     /** The key of the configuration. e.g. true */
     String LOGGING_SEARCH_DOCS_ENABLED = "logging.search.docs.enabled";
 
@@ -1206,8 +1209,11 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /** The key of the configuration. e.g. true */
     String LOGGING_SEARCH_USE_LOGFILE = "logging.search.use.logfile";
 
-    /** The key of the configuration. e.g. org.codelibs,org.dbflute,org.lastaflute */
-    String LOGGING_APP_PACKAGES = "logging.app.packages";
+    /** The key of the configuration. e.g. 10000 */
+    String LOGGING_SEARCH_MAX_QUEUE_SIZE = "logging.search.max.queue.size";
+
+    /** The key of the configuration. e.g. 10000 */
+    String LOGGING_CLICK_MAX_QUEUE_SIZE = "logging.click.max.queue.size";
 
     /** The key of the configuration. e.g. 10000 */
     String FORM_ADMIN_MAX_INPUT_SIZE = "form.admin.max.input.size";
@@ -5626,10 +5632,17 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
      */
     Integer getIndexBackupLogLoadTimeoutAsInteger();
 
+    /**
+     * Get the value for the key 'logging.app.packages'. <br>
+     * The value is, e.g. org.codelibs,org.dbflute,org.lastaflute <br>
+     * comment: logging
+     * @return The value of found property. (NotNull: if not found, exception but basically no way)
+     */
+    String getLoggingAppPackages();
+
     /**
      * Get the value for the key 'logging.search.docs.enabled'. <br>
      * The value is, e.g. true <br>
-     * comment: logging
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
     String getLoggingSearchDocsEnabled();
@@ -5637,7 +5650,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /**
      * Is the property for the key 'logging.search.docs.enabled' true? <br>
      * The value is, e.g. true <br>
-     * comment: logging
      * @return The determination, true or false. (if not found, exception but basically no way)
      */
     boolean isLoggingSearchDocsEnabled();
@@ -5664,11 +5676,34 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     boolean isLoggingSearchUseLogfile();
 
     /**
-     * Get the value for the key 'logging.app.packages'. <br>
-     * The value is, e.g. org.codelibs,org.dbflute,org.lastaflute <br>
+     * Get the value for the key 'logging.search.max.queue.size'. <br>
+     * The value is, e.g. 10000 <br>
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
-    String getLoggingAppPackages();
+    String getLoggingSearchMaxQueueSize();
+
+    /**
+     * Get the value for the key 'logging.search.max.queue.size' as {@link Integer}. <br>
+     * The value is, e.g. 10000 <br>
+     * @return The value of found property. (NotNull: if not found, exception but basically no way)
+     * @throws NumberFormatException When the property is not integer.
+     */
+    Integer getLoggingSearchMaxQueueSizeAsInteger();
+
+    /**
+     * Get the value for the key 'logging.click.max.queue.size'. <br>
+     * The value is, e.g. 10000 <br>
+     * @return The value of found property. (NotNull: if not found, exception but basically no way)
+     */
+    String getLoggingClickMaxQueueSize();
+
+    /**
+     * Get the value for the key 'logging.click.max.queue.size' as {@link Integer}. <br>
+     * The value is, e.g. 10000 <br>
+     * @return The value of found property. (NotNull: if not found, exception but basically no way)
+     * @throws NumberFormatException When the property is not integer.
+     */
+    Integer getLoggingClickMaxQueueSizeAsInteger();
 
     /**
      * Get the value for the key 'form.admin.max.input.size'. <br>
@@ -9799,6 +9834,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             return getAsInteger(FessConfig.INDEX_BACKUP_LOG_LOAD_TIMEOUT);
         }
 
+        public String getLoggingAppPackages() {
+            return get(FessConfig.LOGGING_APP_PACKAGES);
+        }
+
         public String getLoggingSearchDocsEnabled() {
             return get(FessConfig.LOGGING_SEARCH_DOCS_ENABLED);
         }
@@ -9819,8 +9858,20 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             return is(FessConfig.LOGGING_SEARCH_USE_LOGFILE);
         }
 
-        public String getLoggingAppPackages() {
-            return get(FessConfig.LOGGING_APP_PACKAGES);
+        public String getLoggingSearchMaxQueueSize() {
+            return get(FessConfig.LOGGING_SEARCH_MAX_QUEUE_SIZE);
+        }
+
+        public Integer getLoggingSearchMaxQueueSizeAsInteger() {
+            return getAsInteger(FessConfig.LOGGING_SEARCH_MAX_QUEUE_SIZE);
+        }
+
+        public String getLoggingClickMaxQueueSize() {
+            return get(FessConfig.LOGGING_CLICK_MAX_QUEUE_SIZE);
+        }
+
+        public Integer getLoggingClickMaxQueueSizeAsInteger() {
+            return getAsInteger(FessConfig.LOGGING_CLICK_MAX_QUEUE_SIZE);
         }
 
         public String getFormAdminMaxInputSize() {
@@ -11358,11 +11409,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
                     "fess_basic_config.bulk,fess_config.bulk,fess_user.bulk,system.properties,fess.json,doc.json");
             defaultMap.put(FessConfig.INDEX_BACKUP_LOG_TARGETS, "click_log.ndjson,favorite_log.ndjson,search_log.ndjson,user_info.ndjson");
             defaultMap.put(FessConfig.INDEX_BACKUP_LOG_LOAD_TIMEOUT, "60000");
+            defaultMap.put(FessConfig.LOGGING_APP_PACKAGES, "org.codelibs,org.dbflute,org.lastaflute");
             defaultMap.put(FessConfig.LOGGING_SEARCH_DOCS_ENABLED, "true");
             defaultMap.put(FessConfig.LOGGING_SEARCH_DOCS_FIELDS,
                     "filetype,created,click_count,title,doc_id,url,score,site,filename,host,digest,boost,mimetype,favorite_count,_id,lang,last_modified,content_length,timestamp");
             defaultMap.put(FessConfig.LOGGING_SEARCH_USE_LOGFILE, "true");
-            defaultMap.put(FessConfig.LOGGING_APP_PACKAGES, "org.codelibs,org.dbflute,org.lastaflute");
+            defaultMap.put(FessConfig.LOGGING_SEARCH_MAX_QUEUE_SIZE, "10000");
+            defaultMap.put(FessConfig.LOGGING_CLICK_MAX_QUEUE_SIZE, "10000");
             defaultMap.put(FessConfig.FORM_ADMIN_MAX_INPUT_SIZE, "10000");
             defaultMap.put(FessConfig.FORM_ADMIN_LABEL_IN_CONFIG_ENABLED, "false");
             defaultMap.put(FessConfig.FORM_ADMIN_DEFAULT_TEMPLATE_NAME, "__TEMPLATE__");

src/main/resources/fess_config.properties

@@ -631,10 +631,12 @@ index.backup.log.targets=click_log.ndjson,favorite_log.ndjson,search_log.ndjson,
 index.backup.log.load.timeout=60000
 
 # logging
+logging.app.packages=org.codelibs,org.dbflute,org.lastaflute
 logging.search.docs.enabled=true
 logging.search.docs.fields=filetype,created,click_count,title,doc_id,url,score,site,filename,host,digest,boost,mimetype,favorite_count,_id,lang,last_modified,content_length,timestamp
 logging.search.use.logfile=true
-logging.app.packages=org.codelibs,org.dbflute,org.lastaflute
+logging.search.max.queue.size=10000
+logging.click.max.queue.size=10000
 
 # ========================================================================================
 #                                                                                     Web

src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp

@@ -84,7 +84,8 @@
 											<la:option value="14.13">14.13</la:option>
 											<la:option value="14.14">14.14</la:option>
 											<la:option value="14.15">14.15</la:option>
-											<la:option value="14.15">14.16</la:option>
+											<la:option value="14.16">14.16</la:option>
+											<la:option value="14.17">14.17</la:option>
 										</la:select>
 									</div>
 								</div>

src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java

@@ -95,6 +95,30 @@ public class FessFileTransformerTest extends UnitFessTestCase {
         url = "smb://example.com/test?.txt";
         exp = "test?.txt";
         assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "https://example.com/test%E3%81%82.txt";
+        exp = "testあ.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "file://example.com/test%E3%81%82.txt";
+        exp = "testあ.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "storage://example.com/test%E3%81%82.txt";
+        exp = "testあ.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "smb://example.com/test%E3%81%82.txt";
+        exp = "test%E3%81%82.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "smb1://example.com/test%E3%81%82.txt";
+        exp = "test%E3%81%82.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "ftp://example.com/test%E3%81%82.txt";
+        exp = "test%E3%81%82.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
     }
 
     public void test_decodeUrl_null() throws Exception {