Skip to content

Commit 4638206

Browse files
authored
Merge pull request #711 from microsoftgraph/v1.0/pipelinebuild/45773
Generated v1.0 models and request builders using Typewriter
2 parents 6d233f2 + 95524dc commit 4638206

File tree

95 files changed

+9115
-1559
lines changed

Some content is hidden

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

95 files changed

+9115
-1559
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
2020
dependencies {
2121
// Include the sdk as a dependency
22-
implementation 'com.microsoft.graph:microsoft-graph:3.1.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:3.2.0'
2323
// Uncomment the line below if you are building an android application
2424
//implementation 'com.google.guava:guava:29.0-android'
2525
}
@@ -33,7 +33,7 @@ Add the dependency in `dependencies` in pom.xml
3333
<dependency>
3434
<groupId>com.microsoft.graph</groupId>
3535
<artifactId>microsoft-graph</artifactId>
36-
<version>3.1.0</version>
36+
<version>3.2.0</version>
3737
</dependency>
3838
```
3939

@@ -127,3 +127,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
127127

128128
[Third-party notices](THIRD%20PARTY%20NOTICES)
129129

130+

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ org.gradle.caching=true
2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph
2828
mavenMajorVersion = 3
29-
mavenMinorVersion = 1
29+
mavenMinorVersion = 2
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -45,3 +45,4 @@ mavenCentralPublishingEnabled=false
4545

4646

4747

48+

src/main/java/com/microsoft/graph/info/Constants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ private Constants() {
1818
/** The client secret to use for unit testing */
1919
public static final String CLIENTSECRET = "clientsecret";
2020
/** The SDK version */
21-
public static final String VERSION_NAME = "3.1.0";
21+
public static final String VERSION_NAME = "3.2.0";
2222
}
2323

2424

25+
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Template Source: BaseEntity.java.tt
2+
// ------------------------------------------------------------------------------
3+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
// ------------------------------------------------------------------------------
5+
6+
package com.microsoft.graph.models;
7+
import com.microsoft.graph.serializer.ISerializer;
8+
import com.microsoft.graph.serializer.IJsonBackedObject;
9+
import com.microsoft.graph.serializer.AdditionalDataManager;
10+
import java.util.EnumSet;
11+
import com.microsoft.graph.models.TeamworkNotificationRecipient;
12+
13+
14+
import com.google.gson.JsonObject;
15+
import com.google.gson.annotations.SerializedName;
16+
import com.google.gson.annotations.Expose;
17+
import javax.annotation.Nullable;
18+
import javax.annotation.Nonnull;
19+
20+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
21+
22+
/**
23+
* The class for the Aad User Notification Recipient.
24+
*/
25+
public class AadUserNotificationRecipient extends TeamworkNotificationRecipient implements IJsonBackedObject {
26+
27+
28+
/**
29+
* The User Id.
30+
* Azure AD user identifier. Use the List users method to get this ID.
31+
*/
32+
@SerializedName(value = "userId", alternate = {"UserId"})
33+
@Expose
34+
@Nullable
35+
public String userId;
36+
37+
38+
/**
39+
* Sets the raw JSON object
40+
*
41+
* @param serializer the serializer
42+
* @param json the JSON object to set this object to
43+
*/
44+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
45+
46+
}
47+
}

src/main/java/com/microsoft/graph/models/AccessReviewReviewerScope.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public final AdditionalDataManager additionalDataManager() {
4848

4949
/**
5050
* The Query Root.
51-
* In the scenario where reviewers need to be specified dynamically, this property is used to indicate the relative source of the query. This property is only required if a relative query (i.e., ./manager) is specified.
51+
* The type of query. Examples include MicrosoftGraph and ARM.
5252
*/
5353
@SerializedName(value = "queryRoot", alternate = {"QueryRoot"})
5454
@Expose
@@ -57,7 +57,7 @@ public final AdditionalDataManager additionalDataManager() {
5757

5858
/**
5959
* The Query Type.
60-
* The type of query. Examples include MicrosoftGraph and ARM.
60+
* In the scenario where reviewers need to be specified dynamically, this property is used to indicate the relative source of the query. This property is only required if a relative query (i.e., ./manager) is specified.
6161
*/
6262
@SerializedName(value = "queryType", alternate = {"QueryType"})
6363
@Expose

src/main/java/com/microsoft/graph/models/AdminConsentRequestPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class AdminConsentRequestPolicy extends Entity implements IJsonBackedObje
6565

6666
/**
6767
* The Reviewers.
68-
* Required.
68+
* The list of reviewers for the admin consent. Required.
6969
*/
7070
@SerializedName(value = "reviewers", alternate = {"Reviewers"})
7171
@Expose

src/main/java/com/microsoft/graph/models/AppRoleAssignment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class AppRoleAssignment extends DirectoryObject implements IJsonBackedObj
3636

3737
/**
3838
* The Created Date Time.
39-
*
39+
* The time when the app role assignment was created.The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only.
4040
*/
4141
@SerializedName(value = "createdDateTime", alternate = {"CreatedDateTime"})
4242
@Expose
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Template Source: BaseEntity.java.tt
2+
// ------------------------------------------------------------------------------
3+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
// ------------------------------------------------------------------------------
5+
6+
package com.microsoft.graph.models;
7+
import com.microsoft.graph.serializer.ISerializer;
8+
import com.microsoft.graph.serializer.IJsonBackedObject;
9+
import com.microsoft.graph.serializer.AdditionalDataManager;
10+
import java.util.EnumSet;
11+
import com.microsoft.graph.models.Entity;
12+
13+
14+
import com.google.gson.JsonObject;
15+
import com.google.gson.annotations.SerializedName;
16+
import com.google.gson.annotations.Expose;
17+
import javax.annotation.Nullable;
18+
import javax.annotation.Nonnull;
19+
20+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
21+
22+
/**
23+
* The class for the App Scope.
24+
*/
25+
public class AppScope extends Entity implements IJsonBackedObject {
26+
27+
28+
/**
29+
* The Display Name.
30+
* Provides the display name of the app-specific resource represented by the app scope. Provided for display purposes since appScopeId is often an immutable, non-human-readable id. This property is read only.
31+
*/
32+
@SerializedName(value = "displayName", alternate = {"DisplayName"})
33+
@Expose
34+
@Nullable
35+
public String displayName;
36+
37+
/**
38+
* The Type.
39+
* Describes the type of app-specific resource represented by the app scope. Provided for display purposes, so a user interface can convey to the user the kind of app specific resource represented by the app scope. This property is read only.
40+
*/
41+
@SerializedName(value = "type", alternate = {"Type"})
42+
@Expose
43+
@Nullable
44+
public String type;
45+
46+
47+
/**
48+
* Sets the raw JSON object
49+
*
50+
* @param serializer the serializer
51+
* @param json the JSON object to set this object to
52+
*/
53+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
54+
55+
}
56+
}

src/main/java/com/microsoft/graph/models/Approval.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class Approval extends Entity implements IJsonBackedObject {
3030

3131
/**
3232
* The Stages.
33-
* Used for the approvalStages property of approval settings in the requestApprovalSettings property of an access package assignment policy. Specifies the primary, fallback, and escalation approvers of each stage.
33+
* A collection of stages in the approval decision.
3434
*/
3535
@SerializedName(value = "stages", alternate = {"Stages"})
3636
@Expose

src/main/java/com/microsoft/graph/models/ApprovalStage.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {
2828

2929
/**
3030
* The Assigned To Me.
31-
*
31+
* Indicates whether the stage is assigned to the calling user to review. Read-only.
3232
*/
3333
@SerializedName(value = "assignedToMe", alternate = {"AssignedToMe"})
3434
@Expose
@@ -37,7 +37,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {
3737

3838
/**
3939
* The Display Name.
40-
*
40+
* The label provided by the policy creator to identify an approval stage. Read-only.
4141
*/
4242
@SerializedName(value = "displayName", alternate = {"DisplayName"})
4343
@Expose
@@ -46,7 +46,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {
4646

4747
/**
4848
* The Justification.
49-
*
49+
* The justification associated with the approval stage decision.
5050
*/
5151
@SerializedName(value = "justification", alternate = {"Justification"})
5252
@Expose
@@ -55,7 +55,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {
5555

5656
/**
5757
* The Reviewed By.
58-
*
58+
* The identifier of the reviewer. Read-only.
5959
*/
6060
@SerializedName(value = "reviewedBy", alternate = {"ReviewedBy"})
6161
@Expose
@@ -64,7 +64,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {
6464

6565
/**
6666
* The Reviewed Date Time.
67-
*
67+
* The date and time when a decision was recorded. The date and time information uses ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only.
6868
*/
6969
@SerializedName(value = "reviewedDateTime", alternate = {"ReviewedDateTime"})
7070
@Expose
@@ -73,7 +73,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {
7373

7474
/**
7575
* The Review Result.
76-
*
76+
* The result of this approval record. Possible values include: NotReviewed, Approved, Denied.
7777
*/
7878
@SerializedName(value = "reviewResult", alternate = {"ReviewResult"})
7979
@Expose
@@ -82,7 +82,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {
8282

8383
/**
8484
* The Status.
85-
*
85+
* The stage status. Possible values: InProgress, Initializing, Completed, Expired. Read-only.
8686
*/
8787
@SerializedName(value = "status", alternate = {"Status"})
8888
@Expose

0 commit comments

Comments
 (0)