This repository has been archived by the owner. It is now read-only.
Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upGitHub is where the world builds software
Millions of developers and companies build, ship, and maintain their software on GitHub — the largest and most advanced development platform in the world.
#1164 Added Mapping Conflict Check to Spring WebMvc Configuration #1165
Conversation
...g-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java
Outdated
| /** | ||
| * Fix for https://github.com/stormpath/stormpath-sdk-java/issues/1164 | ||
| * | ||
| * @since 1.2.3 |
mraible
Jan 4, 2017
Contributor
Can you please change this to 1.3.0?
Can you please change this to 1.3.0?
...g-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java
Outdated
| * | ||
| * @since 1.2.3 | ||
| */ | ||
| private <T extends AbstractController> void assertUniqueMethodMapping(T c) { |
mraible
Jan 4, 2017
Contributor
Please reformat with IntelliJ's default settings (e.g. space after for, space after if, before brace, etc). Thanks!
Please reformat with IntelliJ's default settings (e.g. space after for, space after if, before brace, etc). Thanks!
...g-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java
Outdated
| throw new IllegalStateException("Mapping conflict. Stormpath cannot map '" + c.getUri() + "'. " + | ||
| "There is already '" + handlerMethod.getBean() + | ||
| "' bean method\n" + handlerMethod + " mapped."); | ||
| } |
mraible
Jan 4, 2017
Contributor
I would change this to read: `Mapping confict: Stormpath cannot map '" + c.getUri() + "'. " + handlerMethod.getBean() + "#" + handlerMethod + " is already mapped to this URI."
I would change this to read: `Mapping confict: Stormpath cannot map '" + c.getUri() + "'. " + handlerMethod.getBean() + "#" + handlerMethod + " is already mapped to this URI."
|
@mraible The changes you've requested are done. Thanks. |
|
@kanderson450 Cool - thanks! LGTM Will merge after CI passes. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
This PR fixes #1164 by adding a method that checks whether any
Mappingsdefined by the User conflict with those that Stormpath wants to create. If a conflict is found, anIllegalStateExceptionis thrown which adheres to the standard Spring behavior.