#2668 replace with orElse

This commit is contained in:
Shinsuke Sugaya 2022-07-15 07:52:38 +09:00
parent 3ead78e019
commit 82c89e34fd
6 changed files with 7 additions and 7 deletions

View file

@ -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);

View file

@ -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

View file

@ -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

View file

@ -80,7 +80,7 @@ public class UserInfoHelper {
updateUserSessionId(userCode);
}
return userCode;
}).get();
}).orElse(null);
}
protected String getUserCodeFromUserBean(final HttpServletRequest request) {

View file

@ -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) {

View file

@ -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) {