diff --git a/src/main/java/org/codelibs/fess/annotation/Secured.java b/src/main/java/org/codelibs/fess/annotation/Secured.java
index 8855e0863c5fce37ee736cf964843008d0f1d04a..9e2a0a83258da84ea79a09a44371192728477c48 100644
--- a/src/main/java/org/codelibs/fess/annotation/Secured.java
+++ b/src/main/java/org/codelibs/fess/annotation/Secured.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
*
* <p>
* The <code>Secured</code> annotation is used to define a list of security configuration
- * attributes for business methods.
+ * attributes for business methods.
* <p>
* For example:
*
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java b/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
index cc0ceaa7d17bbc5460ad4a2370906404bba4d461..d55e4b0012bbad6bf979cdaf6d77b126a52e2626 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
@@ -296,7 +296,7 @@ public class AdminAction extends FessAdminAction {
})
public HtmlResponse index() {
return redirect(getUserBean().map(user -> {
- Class<? extends FessAdminAction> actionClass = getAdminActionClass(user);
+ final Class<? extends FessAdminAction> actionClass = getAdminActionClass(user);
if (actionClass != null) {
return actionClass;
}
@@ -304,7 +304,7 @@ public class AdminAction extends FessAdminAction {
}).orElse(AdminDashboardAction.class));
}
- public static Class<? extends FessAdminAction> getAdminActionClass(FessUserBean user) {
+ public static Class<? extends FessAdminAction> getAdminActionClass(final FessUserBean user) {
if (user.hasRoles(getActionRoles(AdminDashboardAction.ROLE))) {
return AdminDashboardAction.class;
} else if (user.hasRoles(getActionRoles(AdminWizardAction.ROLE))) {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java b/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
index 38fac6235dc9b7eeae93349d743ba97f7e249372..7359806ce2ddcc210f1460a23fad86b0413fb039 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
@@ -224,7 +224,7 @@ public class AdminStorageAction extends FessAdminAction {
try {
minioClient.makeBucket(fessConfig.getStorageBucket());
logger.info("Created bucket: {}", fessConfig.getStorageBucket());
- } catch (Exception e1) {
+ } catch (final Exception e1) {
logger.warn("Failed to create bucket:" + fessConfig.getStorageBucket(), e1);
}
} else if (logger.isDebugEnabled()) {
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
index df9fff70a50c92d269df50ddf2500243a19b7c20..208bd44b9c0e0cc49f33a5d7c14c01b1e4fd19bb 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java
@@ -71,7 +71,7 @@ public interface CrawlingConfig {
public enum ConfigType {
WEB("W"), FILE("F"), DATA("D");
- private String typePrefix;
+ private final String typePrefix;
ConfigType(final String typePrefix) {
this.typePrefix = typePrefix;
diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
index b0d59d7a920909de67e9e2b222b05b4f2b4a3188..13014dff0911dd2f4703482365529e9e8301ac9f 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -117,7 +117,7 @@ public class SystemHelper {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- cal.set(2021, 6 - 1, 2);
+ cal.set(2021, 6 - 1, 2); // EOL Date
eolTime = cal.getTimeInMillis();
if (isEoled()) {
logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");
diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
index 07f8cd98979bd061ed24c327c0cc16454234dd19..d6397483f572790d645eb04bd70196323e1ede9e 100644
--- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
+++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
@@ -2880,7 +2880,7 @@ public class FessLabels extends UserMessages {
/** The key of the message: Running as Development mode. For production use, please install a standalone elasticsearch server. */
public static final String LABELS_development_mode_warning = "{labels.development_mode_warning}";
- /** The key of the message: Your system is out of service. See EOL page. */
+ /** The key of the message: Your system is out of support. See EOL page. */
public static final String LABELS_eol_error = "{labels.eol_error}";
/** The key of the message: Advance */
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfigImpl.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfigImpl.java
index 306449ca698ce5fe6757ceff6ba375d648a6e080..e069cfe25cd1f745f5c9ad4350aee4bdd0b75588 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfigImpl.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfigImpl.java
@@ -30,22 +30,22 @@ public class FessConfigImpl extends FessConfig.SimpleImpl {
private static final String FESS_CONFIG = "fess.config.";
@Override
- protected ObjectiveProperties newObjectiveProperties(String resourcePath, PropertyFilter propertyFilter) {
+ protected ObjectiveProperties newObjectiveProperties(final String resourcePath, final PropertyFilter propertyFilter) {
return new ObjectiveProperties(resourcePath) { // for e.g. checking existence and filtering value
Cache<String, String> cache = CacheBuilder.newBuilder().build();
@Override
- public String get(String propertyKey) {
+ public String get(final String propertyKey) {
final String plainValue = getFromCache(propertyKey);
final String filteredValue = propertyFilter.filter(propertyKey, plainValue);
verifyPropertyValue(propertyKey, filteredValue); // null checked
return filterPropertyAsDefault(filteredValue); // not null here
}
- private String getFromCache(String propertyKey) {
+ private String getFromCache(final String propertyKey) {
try {
return cache.get(propertyKey, () -> System.getProperty(FESS_CONFIG + propertyKey, super.get(propertyKey)));
- } catch (ExecutionException e) {
+ } catch (final ExecutionException e) {
return super.get(propertyKey);
}
}
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
index 3717ee262f6d5eaa08f7e8c755289844b1545d8a..2d07227f4a32198cea7b2fb6a76ab308788dcf30 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
@@ -2087,14 +2087,14 @@ public interface FessProp {
String getHttpFileuploadMaxSize();
default Long getHttpFileuploadMaxSizeAsLong() {
- String value = getHttpFileuploadMaxSize();
+ final String value = getHttpFileuploadMaxSize();
return value != null ? DfTypeUtil.toLong(value) : null;
}
String getHttpFileuploadThresholdSize();
default Long getHttpFileuploadThresholdSizeAsLong() {
- String value = getHttpFileuploadThresholdSize();
+ final String value = getHttpFileuploadThresholdSize();
return value != null ? DfTypeUtil.toLong(value) : null;
}
}
diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties
index 93a7b847e9f03a5f24a046439297f2210b5ec190..087b801466ccca40a2761b38fc3c0e88e98d7b5b 100644
--- a/src/main/resources/fess_label_ja.properties
+++ b/src/main/resources/fess_label_ja.properties
@@ -951,7 +951,7 @@ labels.esreq_button_upload=送信
labels.facet_is_not_found=該当なし
labels.doc_score=スコア:
labels.development_mode_warning=開発モードで起動しています。本運用環境ではElasticsearchを別途インストールしてください。
-labels.eol_error=ご利用のシステムはサポートが終了しています。製品サポート期限のページを参照して、再インストールしてください。
+labels.eol_error=ご利用のシステムはサポートが終了しています。製品サポート期限のページを参照して、アップグレードしてください。
labels.advance=詳細検索
labels.advance_search_title=詳細検索
labels.advance_search_must_queries=すべての単語を含む