Merge branch 'oauth2'

CONTRIBUTING.md

@@ -1,43 +1,65 @@
 # Contributing to Xero-Java
 We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
 
-- Reporting a bug
-- Discussing the current state of the code
-- Submitting a fix
-- Proposing new features
-- Becoming a maintainer
+We want to make contributing to this project as easy and transparent as possible, whether it's:
 
-## We Develop with Github
-We use github to host code, to track issues and feature requests, as well as accept pull requests.
+The following is a set of guidelines for contributing to Xero and its projects, which are hosted in the [XeroAPI Organization](https://github.com/XeroAPI) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
 
-## We Use OpenAPI Generator
-The best way to propose changes to the codebase is to open an [issue](https://github.com/XeroAPI/Xero-Java/issues) to discuss.  
+### Table Of Contents
+[Code of Conduct](#code-of-conduct)
 
-We are using [OpenAPI Generator](https://github.com/OpenAPITools/openapi-generator) and [our OpenAPI specs](https://github.com/XeroAPI/Xero-OpenAPI), to create and update our models and client classes.  Improvements may require updates to our OAS or our customized mustache templates.
+[I don't want to read this whole thing, I just have a question!!!](#i-dont-want-to-read-this-whole-thing-i-just-have-a-question)
 
-We welcome your feedback and will work with you to incorporate them. (via generated code or pull request):
+[How Can I Contribute?](#how-can-i-contribute)
+  * [Which version of SDK are you using?](#Which-version-of-the-SDK-are-you-using)
+  * [Reporting Bugs](#reporting-bugs)
+  * [Suggesting Enhancements](#suggesting-enhancements)
+  * [Pull Requests](#pull-requests)
 
-Sometimes, a pull request is the best way to communicate a change. 
 
-1. Fork the repo and create your branch from `master`.
-2. If you've added code that should be tested, add tests.
-3. If you've changed implementation, update the documentation.
-4. Ensure the test suite passes.
-5. Issue that pull request!
+## Code of Conduct
+Please note that this project is released with a [Contributor Code of Conduct](https://github.com/XeroAPI/Xero-Java/blob/oauth2/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
 
-## Any contributions you make will be under the MIT Software License
-In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.
+## I don't want to read this whole thing I just have a question!!!
 
-## Report bugs using Github's [issues](https://github.com/XeroAPI/Xero-Java/issues)
-We use GitHub issues to track public bugs. Report a bug by [opening a new issue](); it's that easy!
+> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below.
 
-## General Support inquires
-[Submit requests for support](https://developer.xero.com/contact-xero-developer-platform-support/) using this SDK or Xero's developer platform and APIs to our API Support team.
+We have an official [message board](https://community.xero.com/developer) where Xero API support and the community chimes in with helpful advice if you have questions.
 
-Please don't open GitHub issues for general support - we will be closing these and directing you to submit via the developer platform support form.
+* [API Documentation](https://developer.xero.com/documentation/)
+* [Xero FAQ](https://developer.xero.com/faq)
+* [Community, the official Xero message board](https://community.xero.com/developer)
+* [Stackoverflow - Xero related](https://stackoverflow.com/questions/tagged/xero-api?sort=Newest)
+* [Submit requests for support](https://developer.xero.com/contact-xero-developer-platform-support/) to our API Support team.
 
-## Write bug reports with detail, background, and sample code
+# How Can I Contribute?
 
+You can contribute by reporting bugs, suggesting enhancements, improving documentation i.e. [README](https://github.com/XeroAPI/Xero-Java/blob/oauth2/README.md) or submitting a pull request.
+
+
+## Which version of the SDK are you using?
+
+As of Sept 2019, support for oAuth 2 will be generally available for developers.  During this transition period from oAuth 1.0a to oAuth 2, we will be supporting two versions of the SDK.  
+
+
+* 2.x code resides in `master` and supports oAuth 1.0a
+* 3.x code resides in the `oauth2` branch and supports oAuth 2
+
+Bugs and enhancements for version 3.x will be prioritized over 2.x.
+
+## Reporting Bugs
+
+Bugs are tracked as issues in this repository.
+
+Before opening a new issue:
+* **check [the README](https://github.com/XeroAPI/Xero-Java/blob/oauth2/README.md)** to see if the behavior you observed might be expected and if configuration options are available to provide you with the desired behavior.
+
+* **perform a cursory search** to see if there's [an existing issue](https://github.com/XeroAPI/Xero-Java/issues) covering your feedback. If there is one and the issue is still open, **add a :+1: reaction** on the issue to express interest in the issue being resolved. That will help the team gauge interest without the noise of comments which trigger notifications to all watchers. Comments should be used only if you have new and useful information to share.
+
+### Write bug reports with detail, background, and sample code
+
+- Which version of the SDK are you using?
 - A quick summary and/or background
 - Steps to reproduce
   - Be specific!
@@ -46,7 +68,38 @@ Please don't open GitHub issues for general support - we will be closing these a
 - What actually happens
 - Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
 
-## Use a Consistent Coding Style
+## Suggesting Enhancements
+
+When opening an issue for a feature request:
+* **use a clear and descriptive title** for the issue to identify the problem.
+* **include as many details as possible in the body**. Explain your use-case, the problems you're hitting and the solutions you'd like to see to address those problems.
+
+## Pull requests
+
+We welcome your feedback and pull requests. Be aware some code is generated and pull requests may not be the best solution -  see below.
+
+### We Use OpenAPI Generator
+The best way to propose changes to the codebase is to open an [issue](https://github.com/XeroAPI/Xero-Java/issues) and discuss with our team.  
+
+We are using [OpenAPI Generator](https://github.com/OpenAPITools/openapi-generator) and [our OpenAPI specs](https://github.com/XeroAPI/Xero-OpenAPI), to create and update our models and client classes.  Improvements may require updates to our OAS or our customized mustache templates instead of modifying via pull request.
+
+### Submit a pull request
+
+1. Fork and clone the repository
+1. Create a new branch: `git checkout -b my-branch-name`
+1. Make your change, add tests if needed
+1. Make sure the tests pass on your machine: `mvn test`
+1. Push to your fork and submit a pull request
+1. Pat your self on the back and wait for your pull request to be reviewed and merged.
+
+Here are a few things you can do that will increase the likelihood of your pull request being accepted:
+
+- Follow the [style guide](#style-guide).
+- Write tests.
+- Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
+- Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+### Style Guide
 
 * 4 spaces for indentation rather than tabs