Javadoc patch for RequestMapping (SPR-9483)

[DavidBiesack]

Updated Javadoc for RequestMapping as suggested in
https://jira.springsource.org/browse/SPR-9483

 * <p>The format is a media type or sequence of media types,
 * with a request only mapped if the {@code Content-Type} matches one of these media types.
     * Examples: {@code consumes = "text/plain"} <code>consumes = {"text/plain", "application/*"}</code>

similar for produces.

Update 06/13/2012:
I have signed and agree to the terms of the SpringSource Individual Contributor License Agreement.

[rstoyanchev]

Thanks for the pull request. You will need to sign the Contributor License agreement. See the guidelines. This is only one time and should be very quick.

[rstoyanchev]

The change has been merged.

Note that I've corrected white space formatting (tabs instead of spaces), updated the commit comment with the issue number, and rebased the change on top of the latest in master. This means your fork needs a hard reset to correct its history. For the future I recommend submitting pull requests from a dedicated branch since you can then simply remove the temporary branch once the pull request has been merged.

[DavidBiesack]

Rossen Stoyanchev reply@reply.github.com writes:

The change has been merged.

Note that I've corrected white space formatting (tabs instead of spaces), updated the commit comment with the issue number, and rebased the change on top of the latest in master. This means your fork needs a hard reset to correct its history. For the future I recommend submitting pull requests from a dedicated branch since you can then simply remove the temporary branch once the pull request has been merged.

Thanks. I'm very new to GitHub and somewhat of a Git novice. I missed the Help step of creating a branch in my fork before starting to make the change. Doh!

I've done a

git reset --hard

in my local source dir, but I don't know how to proceed to merge the file to match the version you committed. Or can/should I just remove my fork on GitHub? any harm in that (since I don't need it)?

---

Reply to this email directly or view it on GitHub:
#92 (comment)

[rstoyanchev]

What I would usually do in those cases is "fetch" the changes from the Spring Framework repository and then do a reset to that. Assuming you have a remote for the Spring Framework called upstream you can do:

git fetch upstream
git checkout master
get reset --hard upstream/master

If you don't have a remote for the Spring framework, you can add it:

git remote add upstream https://github.com/SpringSource/spring-framework.git

I also recommend using something like gitk to visualize the commits and make inspect the results before and after the above operations.

If you don't have any changes to lose, you can always delete your fork and create it again.