Merge branch 'master' into planner-helpers

Author: Caitlin Bales (MSFT)

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,38 @@
+<!-- Read me before you submit this issue
+
+First off, thank you for taking the time to open this issue! We do appreciate it. Please bear with us if we don't get to this right away.
+
+If this is a question about the Microsoft Graph service API, or a question about how to use this SDK, please post your question to StackOverflow with the [microsoftgraph] tag.
+https://stackoverflow.com/questions/tagged/microsoft-graph
+
+This repo is for the Microsoft Graph Java SDK. Issues opened in this repo should only target this SDK.
+
+Before you open this issue, did you:
+- Search the issues to determine whether someone already opened this issue?
+- Search StackOverflow for an answer?
+- Capture the repro steps and gather the information requested in the steps below to reproduce your scenario?
+- Review the samples under github.com/microsoftgraph? They can help for some scenarios.
+- Take a look at the functional tests in this repo? They may have an example for you. See the [functional tests](https://github.com/microsoftgraph/msgraph-sdk-java/tree/master/src/test/java/com/microsoft/graph/functional)
+
+-->
+
+Please provide the following (and please check them off the list with [x]) before submitting this issue:
+- [ ] Expected behavior. Please provide **links to the specific [Microsoft Graph documentation](https://developer.microsoft.com/en-us/graph/docs/concepts/overview)** you used to determine the expected behavior. 
+- [ ] Actual behavior. Provide error codes, stack information, and a [Fiddler](http://www.telerik.com/fiddler) capture of the request and response (please remove personally identifiable information before posting).
+- [ ] Steps to reproduce the behavior. Include your code, IDE versions, client library versions, and any other information that might be helpful to understand your scenario.
+
+### Expected behavior
+
+
+
+
+### Actual behavior
+
+
+
+
+### Steps to reproduce the behavior
+
+
+
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+<!-- Read me before you submit this pull request
+
+First off, thank you for opening this pull request! We do appreciate it.
+
+The requests and models for this client library are generated. We won't be accepting pull requests for those code files. With that said, we do appreciate
+it when you open pull requests with the proposed file changes, as we'll use that to help guide us in updating our template files.
+
+-->
+
+<!-- Optional. Set the issues that this pull request fixes. Delete 'Fixes #' if there isn't an issue associated with this pull request. -->
+Fixes #
+
+<!-- Required. Provide specifics about what the changes are and why you're proposing these changes. -->
+### Changes proposed in this pull request
+-
+
+<!-- Optional. Provide related links. This might be other pull requests, code files, StackOverflow posts. Delete this section if it is not used. -->
+### Other links
+-

.gitignore

@@ -28,3 +28,7 @@ hs_err_pid*
 .project
 .classpath
 .settings
+
+# Maven
+/target/
+/pom.xml

.travis.yml

@@ -0,0 +1 @@
+language: java

docs/contributions.md CONTRIBUTING.mddocs/contributions.md renamed to CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to the Microsoft Graph SDK for Android
+# Contributing to the Microsoft Graph SDK for Java
 
 The Microsoft Graph SDK is available for all manner of contribution. There are a couple of different recommended paths to get contributions into the released version of this SDK.
 
@@ -10,7 +10,7 @@ The best way to get started with a contribution is to start a dialog with the ow
 
 ## Submit pull requests for trivial changes
 
-If you are making a change that does not affect the interface components and does not affect other downstream callers, feel free to make a pull request against the __master__ branch.  The master branch will be updated frequently, and the gradle dependency will be kept closely inline with it.
+If you are making a change that does not affect the interface components and does not affect other downstream callers, feel free to make a pull request against the __dev__ branch.  The dev branch will be updated frequently.
 
 Revisions of this nature will result in a 0.0.X change of the version number.
 
@@ -19,3 +19,6 @@ Revisions of this nature will result in a 0.0.X change of the version number.
 If major functionality is being added, or there will need to be gestation time for a change, it should be submitted against the __feature__ branch.
 
 Revisions of this nature will result in a 0.X.X change of the version number.
+
+## Submit pull requests for model or request files
+You can revise code in the extension folders of these folders. See [Extending the Library](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Extending-the-Library) for more information on how to work with the generated parts of the library.

README.md

@@ -12,8 +12,10 @@ We welcome your feedback as we drive the quality of this to general availability
 Integrate the [Microsoft Graph API](https://graph.microsoft.io/en-us/getting-started) into your Java application!
 
 ## 1. Installation
-### 1.1 Install AAR via Gradle
-Add the JCenter repository and a compile dependency for `msicrosoft-graph` to your project's `build.gradle`
+### 1.1 Install via Gradle
+*This package will not be available via Gradle until it hits public preview. You will need to download the source and reference the package locally.*
+
+Add the JCenter repository and a compile dependency for `microsoft-graph` to your project's `build.gradle`
 
 ```gradle
 repository {
@@ -22,10 +24,7 @@ repository {
 
 dependency {
     // Include the sdk as a dependency
-    compile('com.microsoft.graph:1.0.+')
-
-    // Include the gson dependency
-    compile('com.google.code.gson:gson:2.3.1')
+    compile('com.microsoft.graph:msgraph-sdk-java:1.0.+')
 }
 ```
 
@@ -41,76 +40,75 @@ Register your application by following [these](https://developer.microsoft.com/e
 ### 2.2 Create an IAuthenticationProvider object
 
 An instance of the **GraphServiceClient** class handles building requests,
-sending them to Microsoft Graph API, and processing the responses. To create a
+sending them to the Microsoft Graph API, and processing the responses. To create a
 new instance of this class, you need to provide an instance of
 `IAuthenticationProvider` which can authenticate requests to Microsoft Graph.
 
 For an example of authentication in a client application see the [MSGraph SDK Android MSA Auth for Android Adapter](https://github.com/microsoftgraph/msgraph-sdk-android-msa-auth-for-android-adapter).
 
 ### 2.3 Get a GraphServiceClient object
 
+TODO: the para below needs expansion or removal. Would need to mention the different flows (authorization code flow, implicit flow, client credential flow) and give pointers on where to get sample code. Dave Moten can provide link for client credentials flow.
+
 Once you have set the correct application ID and url, you must get a **GraphServiceClient** object to make requests against the service. The SDK will store the account information for you, but when a user logs on for the first time, it will invoke UI to get the user's account information.
 
 ```java
-final IClientConfig mCLientConfig = DefaultClientConfig
-                                        .createWithAuthenticationProvider(mAuthenticationProvider);
+IClientConfig clientConfig = 
+  DefaultClientConfig.createWithAuthenticationProvider(mAuthenticationProvider);
 
-final IGraphServiceClient mClient = new GraphServiceClient
-                                            .Builder()
-                                            .fromConfig(mClientConfig)
-                                            .buildClient();
+IGraphServiceClient graphClient = 
+  GraphServiceClient.builder()
+    .fromConfig(mClientConfig)
+    .buildClient();
 ```
 
 ## 3. Make requests against the service
 
-Once you have an GraphServiceClient that is authenticated you can begin making calls against the service. The requests against the service look like our [REST API](https://developer.microsoft.com/en-us/graph/docs/concepts/overview).
+Once you have a GraphServiceClient that is authenticated you can begin making calls against the service. The requests against the service look like our [REST API](https://developer.microsoft.com/en-us/graph/docs/concepts/overview).
 
-### Get the drive
+### Get the user's drive
 
-To retrieve a user's drive:
+To retrieve the user's drive:
 
 ```java
 graphClient
-    .me()
-    .drive()
-    .buildRequest()
-    .get(new ICallback<Drive>() {
-  @Override
-  public void success(final Drive result) {
-    final String msg = "Found Drive " + result.id;
-    Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT)
-        .show();
-  }
-  ...
-  // Handle failure case
-});
+  .me()
+  .drive()
+  .buildRequest()
+  .get(new ICallback<Drive>() {
+     @Override
+     public void success(final Drive result) {
+        System.out.println("Found Drive " + result.id);
+     }
+     ...
+     // Handle failure case
+  });
 ```
 
-For a general overview of how the SDK is designed, see [overview](docs/overview.md).
+For a general overview of how the SDK is designed, see [overview](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Overview).
 
 ## 4. Documentation
 
 For a more detailed documentation see:
 
-* [Overview](docs/overview.md)
-* [Extensibility](docs/extensibility.md)
-* [Handling Open Types, PATCH support with `null` values](docs/opentypes.md)
-* [Collections](docs/collections.md)
-* [Errors](docs/errors.md)
-* [Making Custom Requests](docs/custom-queries.md)
-* [Known Issues](docs/known-issues.md)
-* [Contributions](docs/contributions.md)
+* [Overview](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Overview)
+* [Extending the library](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Extending-the-Library)
+* [Handling Open Types, PATCH support with `null` values](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Working-with-Open-Types)
+* [Collections](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Working-with-Collections)
+* [Making Custom Requests](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Custom-Requests)
+* [Known Issues](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Known-Issues)
+* [Contributions](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md)
 
 ## 5. Issues
 
 For known issues, see [issues](https://github.com/MicrosoftGraph/msgraph-sdk-java/issues).
 
 ## 6. Contributions
 
-The Microsoft Graph SDK is open for contribution. Please read how to contribute to this project [here](docs/contributions.md).
+The Microsoft Graph SDK is open for contribution. Please read how to contribute to this project [here](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md).
 
 ## 7. Supported Java Versions
-The Microsoft Graph SDK for Java library is supported at runtime for Java 6+ and [Android API revision 15](http://source.android.com/source/build-numbers.html) and greater.
+The Microsoft Graph SDK for Java library is supported at runtime for Java 7+ and [Android API revision 15](http://source.android.com/source/build-numbers.html) and greater.
 
 ## 8. License
 

build.gradle

@@ -10,6 +10,8 @@
 apply plugin: 'java-library'
 apply plugin: 'java'
 apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
+
 // In this section you declare where to find the dependencies of your project
 repositories {
     // Use jcenter for resolving your dependencies.
@@ -27,11 +29,27 @@ dependencies {
     // Use JUnit test framework
     testImplementation 'junit:junit:4.12'
 
-    compile 'com.google.code.gson:gson:2.2.4'
-    compile 'org.json:json:20141113'
-    compile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0-m02'
+    compile 'com.google.code.gson:gson:2.8.2'
 
-    // https://mvnrepository.com/artifact/com.sun.jersey/jersey-server
-	compile group: 'com.sun.jersey', name: 'jersey-server', version: '1.19.4'
+    compile 'com.sun.jersey:jersey-server:1.19.4'
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId 'com.microsoft.graph'
+            artifactId 'msgraph-sdk-java'
+            version '0.1-SNAPSHOT'
+
+            from components.java
+            
+            artifact sourceJar
+        }
+    }
+}
+
+task sourceJar(type: Jar) {
+  classifier = 'sources'
+  from sourceSets.main.allJava
 }