Have something you’d like to contribute to Spring AMQP? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Spring team when evaluating your submission.
Please refer back to this document as a checklist before issuing any pull request; this will save time for everyone!
This project adheres to the Contributor Covenant code of conduct. By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
Not sure what a pull request is, or how to submit one? Take a look at GitHub’s excellent documentation: Using Pull Requests first.
Is there already an issue that addresses your concern? Search the GitHub issue tracker (and JIRA issue tracker) to see if you can find something similar. If not, please create a new issue in GitHub before submitting a pull request unless the change is truly trivial, e.g. typo fixes, removing compiler warnings, etc.
If you have not previously done so, please fill out and submit the Contributor License Agreement (CLA).
Very important, before we can accept any Spring AMQP contributions, we will need you to sign the CLA. Signing the CLA does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.
-
Hit the "fork" button and choose your own github account as the target
-
For more detail see Fork A Repo.
-
git clone --recursive git@github.com:<your-github-username>/spring-amqp.git -
cd spring-amqp -
git remote showyou should see only 'origin' - which is the fork you created for your own github account -
git remote add upstream git@github.com:spring-projects/spring-amqp.git -
git remote showyou should now see 'upstream' in addition to 'origin' where 'upstream' is the Spring repository from which releases are built -
git fetch --all -
git branch -ayou should see branches on origin as well as upstream, including 'main' and 'maint'
-
Always work on topic branches (Typically use the GitHub (or JIRA) issue ID as the branch name).
-
For example, to create and switch to a new branch for issue #123:
git checkout -b GH-123
-
-
You might be working on several different topic branches at any given time, but when at a stopping point for one of those branches, commit (a local operation).
-
Please follow the "Commit Guidelines" described in this chapter of Pro Git.
-
Then to begin working on another issue (say AMQP-101):
git checkout AMQP-101. The -b flag is not needed if that branch already exists in your local repository. -
When ready to resolve an issue or to collaborate with others, you can push your branch to origin (your fork), e.g.:
git push origin GH-123 -
If you want to collaborate with another contributor, have them fork your repository (add it as a remote) and
git fetch <your-username>to grab your branch. Alternatively, they can usegit fetch --allto sync their local state with all of their remotes. -
If you grant those collaborator(s) push access to your repository, they can even apply their changes to your branch.
-
When ready for your contribution to be reviewed for potential inclusion in the main branch of the canonical spring-amqp repository (what you know as 'upstream'), issue a pull request to the SpringSource repository (for more detail, see Using pull requests).
-
The project lead may merge your changes into the upstream main branch as-is, he may keep the pull request open yet add a comment about something that should be modified, or he might reject the pull request by closing it.
-
A prerequisite for any pull request is that it will be cleanly merge-able with the upstream main’s current state. This is the responsibility of any contributor. If your pull request cannot be applied cleanly, the project lead will most likely add a comment requesting that you make it merge-able. For a full explanation, see the Pro Git section on rebasing. As stated there: "> Often, you’ll do this to make sure your commits apply cleanly on a remote branch — perhaps in a project to which you’re trying to contribute but that you don’t maintain."
-
As mentioned above, you should always work on topic branches (since 'main' is a moving target). However, you do want to always keep your own 'origin' main branch in synch with the 'upstream' main.
-
Within your local working directory, you can sync up all remotes' branches with:
git fetch --all -
While on your own local main branch:
git pull upstream main(which is the equivalent of fetching upstream/main and merging that into the branch you are in currently) -
Now that you’re in synch, switch to the topic branch where you plan to work, e.g.:
git checkout -b AMQP-123 -
When you get to a stopping point:
git commit -
If changes have occurred on the upstream/main while you were working you can synch again:
-
Switch back to main:
git checkout main -
Then:
git pull upstream main -
Switch back to the topic branch:
git checkout AMQP-123(no -b needed since the branch already exists) -
Rebase the topic branch to minimize the distance between it and your recently synched main branch:
git rebase main(Again, for more detail see the Pro Git section on rebasing).
-
-
Note While it is generally recommended to not re-write history by using
push --force, and we do not do this onmain(and release) branches in the main repo, we require topic branches for pull requests to be rebased before merging, in order to maintain a clean timeline and avoid "merge" commits. -
If, while rebasing for the merge, we find significant conflicts, we may ask you to rebase and
push --forceto your topic branch after resolving the conflicts. -
Assuming your pull request is merged into the 'upstream' main, you will actually end up pulling that change into your own main eventually, and at that time, you may decide to delete the topic branch from your local repository and your fork (origin) if you pushed it there.
-
to delete the local branch:
git branch -d GH-123 -
to delete the branch from your origin:
git push origin :GH-123
-
When merging to main, the project always uses fast-forward merges. When issuing pull requests, please ensure that your commit history is linear. From the command line you can check this using:
log --graph --pretty=oneline
As this may cause lots of typing, we recommend creating a global alias, e.g. git logg for this:
git config --global alias.logg 'log --graph --pretty=oneline'
This command, will provide the following output, which in this case shows a nice linear history:
* e11821842f22b1a9461ab2209c0be7cd47f5c25e AMQP-566: Add String Version of CorrelationId * 59710724e5df4414139f67145152fc943d45baf7 Exclude with modules to meet IO requirements * d0f6e61308a020bdeb06992ece63fa3c4bad99d7 AMQP-539: Add AsyncRabbitTemplate * 51a56bb2ddcef4d3eee781e295dc608a455ae8ff AMQP-559: Fix Pre-Java8 Compliance * 8afa05fd6c262047dca1cea131e69979b44f725a AMQP-559: Remove Lambdas for IO Compat. Build * f8809d26e9eb36f2d9ed4d86ce89cb438def71da AMQP-565: Fix NPE in RabbitAdmin
If you see intersecting lines, that usually means that you forgot to rebase you branch. As mentioned earlier, please rebase against main before issuing a pull request.
Please carefully follow the whitespace and formatting conventions already present in the framework.
-
Tabs, not spaces
-
Unix (LF), not DOS (CRLF) line endings
-
Eliminate all trailing whitespace
-
Wrap Javadoc at 90 characters
-
Aim to wrap code at 120 characters, but favor readability over wrapping
-
Preserve existing formatting; i.e. do not reformat code for its own sake
-
Search the codebase using
git grepand other tools to discover common naming conventions, etc. -
Latin-1 (ISO-8859-1) encoding for Java sources; use
native2asciito convert if necessary
/*
* Copyright 2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ...;Always check the date range in the Apache license header. For example, if you’ve modified a file in 2016 whose header still reads
* Copyright 2002-2011 the original author or authors.
then be sure to update it to 2016 appropriately
* Copyright 2002-2016 the original author or authors.
Use @since tags for newly-added public API types and methods e.g.
/** * ... * * @author First Last * @since 3.0 * @see ... */
Search the codebase to find related unit tests and add additional @Test methods within. It is also acceptable to submit test cases on a per GitHub issue basis.
Use git rebase --interactive, git add --patch and other tools to "squash" multiple commits into atomic changes.
In addition to the man pages for git, there are many resources online to help you understand how these tools work.
Do not squash commits after a PR is issued against the branch - especially after resolving issues from the review; just add more commits to the branch; it is easier to see what changed since the review.
The committer will generally squash the commits before the final merge.
Please configure git to use your real first and last name for any commits you intend to submit as pull requests. For example, this is not acceptable:
Author: Nickname <user@mail.com>
Rather, please include your first and last name, properly capitalized, as submitted against the SpringIO contributor license agreement:
Author: First Last <user@mail.com>
This helps ensure traceability against the CLA, and also goes a long way to ensuring useful output from tools like git shortlog and others.
You can configure this globally via the account admin area GitHub (useful for fork-and-edit cases); globally with
git config --global user.name "First Last" git config --global user.email user@mail.com
or locally for the spring-amqp repository only by omitting the '--global' flag:
cd spring-amqp git config user.name "First Last" git config user.email user@mail.com
See the checking out and building section of the README for instructions. Make sure that all tests pass prior to submitting your pull request.
If the change is to resolve a legazy JIRA issue, add a comment to the associated JIRA issue(s) linking to your new pull request.
Add a GitHib issue link to your first commit comment of the pull request, so your commit message may look like this:
GH-123: Title up to 50 characters total Fixes https://github.com/spring-projects/spring-amqp/issues/123 Text about the problem and how it was fixed.