Skip to content

Commit bc9b9bc

Browse files
author
May
authored
Replace cascading if statements with switch statement
Closes gh-25308
1 parent 7517394 commit bc9b9bc

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,25 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
8181
}
8282

8383
String name = element.getLocalName();
84-
if (name.equals("view-controller")) {
85-
if (element.hasAttribute("view-name")) {
86-
controller.getPropertyValues().add("viewName", element.getAttribute("view-name"));
87-
}
88-
if (statusCode != null) {
84+
switch (name) {
85+
case "view-controller":
86+
if (element.hasAttribute("view-name")) {
87+
controller.getPropertyValues().add("viewName", element.getAttribute("view-name"));
88+
}
89+
if (statusCode != null) {
90+
controller.getPropertyValues().add("statusCode", statusCode);
91+
}
92+
break;
93+
case "redirect-view-controller":
94+
controller.getPropertyValues().add("view", getRedirectView(element, statusCode, source));
95+
break;
96+
case "status-controller":
8997
controller.getPropertyValues().add("statusCode", statusCode);
90-
}
91-
}
92-
else if (name.equals("redirect-view-controller")) {
93-
controller.getPropertyValues().add("view", getRedirectView(element, statusCode, source));
94-
}
95-
else if (name.equals("status-controller")) {
96-
controller.getPropertyValues().add("statusCode", statusCode);
97-
controller.getPropertyValues().add("statusOnly", true);
98-
}
99-
else {
100-
// Should never happen...
101-
throw new IllegalStateException("Unexpected tag name: " + name);
98+
controller.getPropertyValues().add("statusOnly", true);
99+
break;
100+
default:
101+
// Should never happen...
102+
throw new IllegalStateException("Unexpected tag name: " + name);
102103
}
103104

104105
Map<String, BeanDefinition> urlMap = (Map<String, BeanDefinition>) hm.getPropertyValues().get("urlMap");

0 commit comments

Comments
 (0)