Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace if with switch where feasible

Browse Source 
See gh-31916
This commit is contained in:
Yanming Zhou
2023-12-28 15:44:55 +08:00
committed by Stéphane Nicoll
parent ea5ef098cf
commit cfa3aa001f
7 changed files with 85 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
View File

@@ -131,60 +131,26 @@ public class FacesRequestAttributes implements RequestAttributes {
@Override
public Object resolveReference(String key) {
if (REFERENCE_REQUEST.equals(key)) {
return getExternalContext().getRequest();
}
else if (REFERENCE_SESSION.equals(key)) {
return getExternalContext().getSession(true);
}
else if ("application".equals(key)) {
return getExternalContext().getContext();
}
else if ("requestScope".equals(key)) {
return getExternalContext().getRequestMap();
}
else if ("sessionScope".equals(key)) {
return getExternalContext().getSessionMap();
}
else if ("applicationScope".equals(key)) {
return getExternalContext().getApplicationMap();
}
else if ("facesContext".equals(key)) {
return getFacesContext();
}
else if ("cookie".equals(key)) {
return getExternalContext().getRequestCookieMap();
}
else if ("header".equals(key)) {
return getExternalContext().getRequestHeaderMap();
}
else if ("headerValues".equals(key)) {
return getExternalContext().getRequestHeaderValuesMap();
}
else if ("param".equals(key)) {
return getExternalContext().getRequestParameterMap();
}
else if ("paramValues".equals(key)) {
return getExternalContext().getRequestParameterValuesMap();
}
else if ("initParam".equals(key)) {
return getExternalContext().getInitParameterMap();
}
else if ("view".equals(key)) {
return getFacesContext().getViewRoot();
}
else if ("viewScope".equals(key)) {
return getFacesContext().getViewRoot().getViewMap();
}
else if ("flash".equals(key)) {
return getExternalContext().getFlash();
}
else if ("resource".equals(key)) {
return getFacesContext().getApplication().getResourceHandler();
}
else {
return null;
}
return switch (key) {
case REFERENCE_REQUEST -> getExternalContext().getRequest();
case REFERENCE_SESSION -> getExternalContext().getSession(true);
case "application" -> getExternalContext().getContext();
case "requestScope" -> getExternalContext().getRequestMap();
case "sessionScope" -> getExternalContext().getSessionMap();
case "applicationScope" -> getExternalContext().getApplicationMap();
case "facesContext" -> getFacesContext();
case "cookie" -> getExternalContext().getRequestCookieMap();
case "header" -> getExternalContext().getRequestHeaderMap();
case "headerValues" -> getExternalContext().getRequestHeaderValuesMap();
case "param" -> getExternalContext().getRequestParameterMap();
case "paramValues" -> getExternalContext().getRequestParameterValuesMap();
case "initParam" -> getExternalContext().getInitParameterMap();
case "view" -> getFacesContext().getViewRoot();
case "viewScope" -> getFacesContext().getViewRoot().getViewMap();
case "flash" -> getExternalContext().getFlash();
case "resource" -> getFacesContext().getApplication().getResourceHandler();
default -> null;
};
}
@Override

18
spring-web/src/main/java/org/springframework/web/util/TagUtils.java
View File

@@ -67,18 +67,12 @@ public abstract class TagUtils {
*/
public static int getScope(String scope) {
Assert.notNull(scope, "Scope to search for cannot be null");
if (scope.equals(SCOPE_REQUEST)) {
return PageContext.REQUEST_SCOPE;
}
else if (scope.equals(SCOPE_SESSION)) {
return PageContext.SESSION_SCOPE;
}
else if (scope.equals(SCOPE_APPLICATION)) {
return PageContext.APPLICATION_SCOPE;
}
else {
return PageContext.PAGE_SCOPE;
}
return switch (scope) {
case SCOPE_REQUEST -> PageContext.REQUEST_SCOPE;
case SCOPE_SESSION -> PageContext.SESSION_SCOPE;
case SCOPE_APPLICATION -> PageContext.APPLICATION_SCOPE;
default -> PageContext.PAGE_SCOPE;
};
}
/**