Skip to content

Commit c16047f

Browse files
author
Kyle Anderson
committed
stormpath#1164 Formatting Improvements
1 parent b4f5c28 commit c16047f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,18 +1574,17 @@ public List<String> stormpathCorsAllowedHeaders() {
15741574
/**
15751575
* Fix for https://github.com/stormpath/stormpath-sdk-java/issues/1164
15761576
*
1577-
* @since 1.2.3
1577+
* @since 1.3.0
15781578
*/
15791579
private <T extends AbstractController> void assertUniqueMethodMapping(T c) {
15801580
Set<RequestMappingInfo> requestMappingInfoSet = requestMappingHandlerMapping.getHandlerMethods().keySet();
1581-
for(RequestMappingInfo requestMappingInfo : requestMappingInfoSet){
1581+
for (RequestMappingInfo requestMappingInfo : requestMappingInfoSet) {
15821582
Set<String> patterns = requestMappingInfo.getPatternsCondition().getPatterns();
1583-
for(String pattern: patterns){
1584-
if(c.getUri() != null && c.getUri().equals(pattern)){
1583+
for (String pattern: patterns) {
1584+
if (c.getUri() != null && c.getUri().equals(pattern)) {
15851585
HandlerMethod handlerMethod = requestMappingHandlerMapping.getHandlerMethods().get(requestMappingInfo);
1586-
throw new IllegalStateException("Mapping conflict. Stormpath cannot map '" + c.getUri() + "'. " +
1587-
"There is already '" + handlerMethod.getBean() +
1588-
"' bean method\n" + handlerMethod + " mapped.");
1586+
throw new IllegalStateException("Mapping conflict: Stormpath cannot map '" + c.getUri() + "'. " +
1587+
handlerMethod.getBean() + "#" + handlerMethod + " is already mapped to this URI.");
15891588
}
15901589
}
15911590
}

0 commit comments

Comments
 (0)