This repository was archived by the owner on Dec 12, 2018. It is now read-only.
#1164 Added Mapping Conflict Check to Spring WebMvc Configuration#1165
Open
andersonkyle wants to merge 2 commits intostormpath:masterfrom
Open
#1164 Added Mapping Conflict Check to Spring WebMvc Configuration#1165andersonkyle wants to merge 2 commits intostormpath:masterfrom
andersonkyle wants to merge 2 commits intostormpath:masterfrom
Conversation
mraible
reviewed
Jan 4, 2017
| /** | ||
| * Fix for https://github.com/stormpath/stormpath-sdk-java/issues/1164 | ||
| * | ||
| * @since 1.2.3 |
Contributor
There was a problem hiding this comment.
Can you please change this to 1.3.0?
mraible
reviewed
Jan 4, 2017
| * | ||
| * @since 1.2.3 | ||
| */ | ||
| private <T extends AbstractController> void assertUniqueMethodMapping(T c) { |
Contributor
There was a problem hiding this comment.
Please reformat with IntelliJ's default settings (e.g. space after for, space after if, before brace, etc). Thanks!
mraible
reviewed
Jan 4, 2017
| throw new IllegalStateException("Mapping conflict. Stormpath cannot map '" + c.getUri() + "'. " + | ||
| "There is already '" + handlerMethod.getBean() + | ||
| "' bean method\n" + handlerMethod + " mapped."); | ||
| } |
Contributor
There was a problem hiding this comment.
I would change this to read: `Mapping confict: Stormpath cannot map '" + c.getUri() + "'. " + handlerMethod.getBean() + "#" + handlerMethod + " is already mapped to this URI."
Author
|
@mraible The changes you've requested are done. Thanks. |
Contributor
|
@kanderson450 Cool - thanks! LGTM 👍 Will merge after CI passes. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.