Skip to content

Commit de4b3cd

Browse files
author
Caitlin Bales (MSFT)
authored
Merge branch 'master' into response-headers
2 parents 8d43d35 + 884c295 commit de4b3cd

File tree

3,653 files changed

+4541
-5759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,653 files changed

+4541
-5759
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!-- Read me before you submit this issue
2+
3+
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.
4+
5+
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.
6+
https://stackoverflow.com/questions/tagged/microsoft-graph
7+
8+
This repo is for the Microsoft Graph Java SDK. Issues opened in this repo should only target this SDK.
9+
10+
Before you open this issue, did you:
11+
- Search the issues to determine whether someone already opened this issue?
12+
- Search StackOverflow for an answer?
13+
- Capture the repro steps and gather the information requested in the steps below to reproduce your scenario?
14+
- Review the samples under github.com/microsoftgraph? They can help for some scenarios.
15+
- 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)
16+
17+
-->
18+
19+
Please provide the following (and please check them off the list with [x]) before submitting this issue:
20+
- [ ] 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.
21+
- [ ] 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).
22+
- [ ] 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.
23+
24+
### Expected behavior
25+
26+
27+
28+
29+
### Actual behavior
30+
31+
32+
33+
34+
### Steps to reproduce the behavior
35+
36+
37+
38+

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!-- Read me before you submit this pull request
2+
3+
First off, thank you for opening this pull request! We do appreciate it.
4+
5+
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
6+
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.
7+
8+
-->
9+
10+
<!-- Optional. Set the issues that this pull request fixes. Delete 'Fixes #' if there isn't an issue associated with this pull request. -->
11+
Fixes #
12+
13+
<!-- Required. Provide specifics about what the changes are and why you're proposing these changes. -->
14+
### Changes proposed in this pull request
15+
-
16+
17+
<!-- Optional. Provide related links. This might be other pull requests, code files, StackOverflow posts. Delete this section if it is not used. -->
18+
### Other links
19+
-

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ hs_err_pid*
2828
.project
2929
.classpath
3030
.settings
31+
32+
# Maven
33+
/target/
34+
/pom.xml
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributing to the Microsoft Graph SDK for Android
1+
# Contributing to the Microsoft Graph SDK for Java
22

33
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.
44

@@ -10,7 +10,7 @@ The best way to get started with a contribution is to start a dialog with the ow
1010

1111
## Submit pull requests for trivial changes
1212

13-
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.
13+
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.
1414

1515
Revisions of this nature will result in a 0.0.X change of the version number.
1616

@@ -19,3 +19,6 @@ Revisions of this nature will result in a 0.0.X change of the version number.
1919
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.
2020

2121
Revisions of this nature will result in a 0.X.X change of the version number.
22+
23+
## Submit pull requests for model or request files
24+
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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ repository {
2424
2525
dependency {
2626
// Include the sdk as a dependency
27-
compile('com.microsoft.graph:1.0.+')
28-
29-
// Include the gson dependency
30-
compile('com.google.code.gson:gson:2.3.1')
27+
compile('com.microsoft.graph:msgraph-sdk-java:1.0.+')
3128
}
3229
```
3330

@@ -88,31 +85,30 @@ graphClient
8885
});
8986
```
9087

91-
For a general overview of how the SDK is designed, see [overview](docs/overview.md).
88+
For a general overview of how the SDK is designed, see [overview](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Overview).
9289

9390
## 4. Documentation
9491

9592
For a more detailed documentation see:
9693

97-
* [Overview](docs/overview.md)
98-
* [Extensibility](docs/extensibility.md)
99-
* [Handling Open Types, PATCH support with `null` values](docs/opentypes.md)
100-
* [Collections](docs/collections.md)
101-
* [Errors](docs/errors.md)
102-
* [Making Custom Requests](docs/custom-queries.md)
103-
* [Known Issues](docs/known-issues.md)
104-
* [Contributions](docs/contributions.md)
94+
* [Overview](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Overview)
95+
* [Extending the library](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Extending-the-Library)
96+
* [Handling Open Types, PATCH support with `null` values](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Working-with-Open-Types)
97+
* [Collections](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Working-with-Collections)
98+
* [Making Custom Requests](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Custom-Requests)
99+
* [Known Issues](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Known-Issues)
100+
* [Contributions](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md)
105101

106102
## 5. Issues
107103

108104
For known issues, see [issues](https://github.com/MicrosoftGraph/msgraph-sdk-java/issues).
109105

110106
## 6. Contributions
111107

112-
The Microsoft Graph SDK is open for contribution. Please read how to contribute to this project [here](docs/contributions.md).
108+
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).
113109

114110
## 7. Supported Java Versions
115-
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.
111+
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.
116112

117113
## 8. License
118114

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ publishing {
3838
publications {
3939
maven(MavenPublication) {
4040
groupId 'com.microsoft.graph'
41-
artifactId 'msgraph-sdk-java-prototype'
41+
artifactId 'msgraph-sdk-java'
4242
version '0.1-SNAPSHOT'
4343

4444
from components.java

docs/Generator.png

24.4 KB
Loading

docs/collections.md

Lines changed: 0 additions & 142 deletions
This file was deleted.

docs/custom-queries.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

docs/errors.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)