From 82c89e34fd8e98a5b517989b5080f5b056533c86 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Fri, 15 Jul 2022 07:52:38 +0900
Subject: [PATCH] #2668 replace with orElse
---
src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java | 2 +-
.../org/codelibs/fess/app/web/admin/searchlist/ListForm.java | 2 +-
src/main/java/org/codelibs/fess/app/web/base/SearchForm.java | 2 +-
src/main/java/org/codelibs/fess/helper/UserInfoHelper.java | 2 +-
src/main/java/org/codelibs/fess/taglib/FessFunctions.java | 4 ++--
src/main/java/org/codelibs/fess/util/WebApiUtil.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java b/src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java
index 0d82fe66d..7a0fbe28a 100644
--- a/src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java
@@ -79,7 +79,7 @@ public abstract class BaseJsonApiManager extends BaseApiManager {
}
protected void writeJsonResponse(final int status, final String body) {
- final String callback = LaRequestUtil.getOptionalRequest().map(req -> req.getParameter("callback")).get();
+ final String callback = LaRequestUtil.getOptionalRequest().map(req -> req.getParameter("callback")).orElse(null);
final boolean isJsonp = ComponentUtil.getFessConfig().isApiJsonpEnabled() && StringUtil.isNotBlank(callback);
final StringBuilder buf = new StringBuilder(1000);
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java
index 3bb780dd3..75d0578f9 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java
@@ -142,7 +142,7 @@ public class ListForm extends SearchRequestParams {
@Override
public Object getAttribute(final String name) {
- return LaRequestUtil.getOptionalRequest().map(req -> req.getAttribute(name)).get();
+ return LaRequestUtil.getOptionalRequest().map(req -> req.getAttribute(name)).orElse(null);
}
@Override
diff --git a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java
index 8f63fd675..69c62259d 100644
--- a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java
@@ -135,7 +135,7 @@ public class SearchForm extends SearchRequestParams {
@Override
public Object getAttribute(final String name) {
- return LaRequestUtil.getOptionalRequest().map(req -> req.getAttribute(name)).get();
+ return LaRequestUtil.getOptionalRequest().map(req -> req.getAttribute(name)).orElse(null);
}
@Override
diff --git a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java
index b355c9474..fd0cb7b71 100644
--- a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java
@@ -80,7 +80,7 @@ public class UserInfoHelper {
updateUserSessionId(userCode);
}
return userCode;
- }).get();
+ }).orElse(null);
}
protected String getUserCodeFromUserBean(final HttpServletRequest request) {
diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
index eb609eff0..180d80030 100644
--- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
+++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
@@ -286,7 +286,7 @@ public class FessFunctions {
request.setAttribute(key, query);
}
return query;
- }).get();
+ }).orElse(null);
}
private static String createForm(final String key, final String prefix) {
@@ -314,7 +314,7 @@ public class FessFunctions {
request.setAttribute(key, query);
}
return query;
- }).get();
+ }).orElse(null);
}
public static String base64(final String value) {
diff --git a/src/main/java/org/codelibs/fess/util/WebApiUtil.java b/src/main/java/org/codelibs/fess/util/WebApiUtil.java
index 484c25986..9fd5d05f9 100644
--- a/src/main/java/org/codelibs/fess/util/WebApiUtil.java
+++ b/src/main/java/org/codelibs/fess/util/WebApiUtil.java
@@ -31,7 +31,7 @@ public final class WebApiUtil {
@SuppressWarnings("unchecked")
public static <T> T getObject(final String name) {
- return LaRequestUtil.getOptionalRequest().map(req -> (T) req.getAttribute(name)).get();
+ return LaRequestUtil.getOptionalRequest().map(req -> (T) req.getAttribute(name)).orElse(null);
}
public static void setError(final int statusCode, final String message) {
--
GitLab