Skip to content

Commit 27da3e5

Browse files
Merge pull request #1044 from microsoftgraph/v1.0/pipelinebuild/72445
Generated v1.0 models and request builders using Typewriter
2 parents 9bf53e2 + 222a899 commit 27da3e5

File tree

170 files changed

+13156
-15
lines changed

Some content is hidden

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

170 files changed

+13156
-15
lines changed

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
## [5.20.0] - 2022-04-12
15+
16+
### Added
17+
18+
- ApprovalSettings model.
19+
- RequestSchedule model.
20+
- TicketInfo model.
21+
- UnifiedApprovalStage model.
22+
- UnifiedRoleScheduleRequestActions model.
23+
- AppScopeReference and AppScopeWithReference requests.
24+
- RoleAssignmentSchedule models and related requests.
25+
- RoleEligibilitySchedule models and related requests.
26+
- UnifiedRoleAssignmentSchedule models and related requests.
27+
- UnifiedRoleEligibilitySchedule models and related requests.
28+
- UnifiedRoleManagementPolicy models and related requests.
29+
- UnifiedRoleSchedule models and related requests.
30+
31+
### Changed
32+
33+
- Generated v1.0 models and request builders using Typewriter.
34+
- PolicyRoot model and request builder.
35+
- RbacApplication model and request builder.
36+
1437
## [5.19.0] - 2022-04-05
1538

1639
### Added

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:5.19.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.20.0'
2323
// Uncomment the line below if you are building an android application
2424
//implementation 'com.google.guava:guava:30.1.1-android'
2525
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
@@ -36,7 +36,7 @@ Add the dependency in `dependencies` in pom.xml
3636
<!-- Include the sdk as a dependency -->
3737
<groupId>com.microsoft.graph</groupId>
3838
<artifactId>microsoft-graph</artifactId>
39-
<version>5.19.0</version>
39+
<version>5.20.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -153,3 +153,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
153153

154154

155155

156+

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 = 5
29-
mavenMinorVersion = 19
29+
mavenMinorVersion = 20
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -74,5 +74,6 @@ mavenCentralPublishingEnabled=false
7474

7575

7676

77+
7778

7879

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,7 @@ 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 = "5.19.0";
21+
public static final String VERSION_NAME = "5.20.0";
2222
}
2323

2424

@@ -51,5 +51,6 @@ private Constants() {
5151

5252

5353

54+
5455

5556

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
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.http.BaseCollectionPage;
12+
import com.microsoft.graph.models.UnifiedApprovalStage;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.annotations.SerializedName;
17+
import com.google.gson.annotations.Expose;
18+
import javax.annotation.Nullable;
19+
import javax.annotation.Nonnull;
20+
21+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
22+
23+
/**
24+
* The class for the Approval Settings.
25+
*/
26+
public class ApprovalSettings implements IJsonBackedObject {
27+
28+
/** the OData type of the object as returned by the service */
29+
@SerializedName("@odata.type")
30+
@Expose
31+
@Nullable
32+
public String oDataType;
33+
34+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
35+
36+
@Override
37+
@Nonnull
38+
public final AdditionalDataManager additionalDataManager() {
39+
return additionalDataManager;
40+
}
41+
42+
/**
43+
* The Approval Mode.
44+
* One of NoApproval, SingleStage or Serial. The NoApproval is used when isApprovalRequired is false.
45+
*/
46+
@SerializedName(value = "approvalMode", alternate = {"ApprovalMode"})
47+
@Expose
48+
@Nullable
49+
public String approvalMode;
50+
51+
/**
52+
* The Approval Stages.
53+
* If approval is required, the one or two elements of this collection define each of the stages of approval. An empty array if no approval is required.
54+
*/
55+
@SerializedName(value = "approvalStages", alternate = {"ApprovalStages"})
56+
@Expose
57+
@Nullable
58+
public java.util.List<UnifiedApprovalStage> approvalStages;
59+
60+
/**
61+
* The Is Approval Required.
62+
* If false, then approval is not required for requests in this policy.
63+
*/
64+
@SerializedName(value = "isApprovalRequired", alternate = {"IsApprovalRequired"})
65+
@Expose
66+
@Nullable
67+
public Boolean isApprovalRequired;
68+
69+
/**
70+
* The Is Approval Required For Extension.
71+
* If false, then approval is not required for a user who already has an assignment to extend their assignment.
72+
*/
73+
@SerializedName(value = "isApprovalRequiredForExtension", alternate = {"IsApprovalRequiredForExtension"})
74+
@Expose
75+
@Nullable
76+
public Boolean isApprovalRequiredForExtension;
77+
78+
/**
79+
* The Is Requestor Justification Required.
80+
* Indicates whether the requestor is required to supply a justification in their request.
81+
*/
82+
@SerializedName(value = "isRequestorJustificationRequired", alternate = {"IsRequestorJustificationRequired"})
83+
@Expose
84+
@Nullable
85+
public Boolean isRequestorJustificationRequired;
86+
87+
88+
/**
89+
* Sets the raw JSON object
90+
*
91+
* @param serializer the serializer
92+
* @param json the JSON object to set this object to
93+
*/
94+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
95+
96+
}
97+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public class EducationClass extends Entity implements IJsonBackedObject {
151151

152152
/**
153153
* The Assignment Categories.
154-
*
154+
* All categories associated with this class. Nullable.
155155
*/
156156
@SerializedName(value = "assignmentCategories", alternate = {"AssignmentCategories"})
157157
@Expose
@@ -160,7 +160,7 @@ public class EducationClass extends Entity implements IJsonBackedObject {
160160

161161
/**
162162
* The Assignment Defaults.
163-
*
163+
* Specifies class-level defaults respected by new assignments created in the class.
164164
*/
165165
@SerializedName(value = "assignmentDefaults", alternate = {"AssignmentDefaults"})
166166
@Expose
@@ -178,7 +178,7 @@ public class EducationClass extends Entity implements IJsonBackedObject {
178178

179179
/**
180180
* The Assignment Settings.
181-
*
181+
* Specifies class-level assignments settings.
182182
*/
183183
@SerializedName(value = "assignmentSettings", alternate = {"AssignmentSettings"})
184184
@Expose

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public class EducationUser extends Entity implements IJsonBackedObject {
337337

338338
/**
339339
* The Assignments.
340-
* Assignments that belongs to the user.
340+
* Assignments belonging to the user.
341341
*/
342342
@SerializedName(value = "assignments", alternate = {"Assignments"})
343343
@Expose
@@ -346,7 +346,7 @@ public class EducationUser extends Entity implements IJsonBackedObject {
346346

347347
/**
348348
* The Rubrics.
349-
*
349+
* When set, the grading rubric attached to the assignment.
350350
*/
351351
@SerializedName(value = "rubrics", alternate = {"Rubrics"})
352352
@Expose

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import com.microsoft.graph.models.AdminConsentRequestPolicy;
2323
import com.microsoft.graph.models.ConditionalAccessPolicy;
2424
import com.microsoft.graph.models.IdentitySecurityDefaultsEnforcementPolicy;
25+
import com.microsoft.graph.models.UnifiedRoleManagementPolicy;
26+
import com.microsoft.graph.models.UnifiedRoleManagementPolicyAssignment;
2527
import com.microsoft.graph.models.Entity;
2628
import com.microsoft.graph.requests.ActivityBasedTimeoutPolicyCollectionPage;
2729
import com.microsoft.graph.requests.ClaimsMappingPolicyCollectionPage;
@@ -31,6 +33,8 @@
3133
import com.microsoft.graph.requests.TokenLifetimePolicyCollectionPage;
3234
import com.microsoft.graph.requests.FeatureRolloutPolicyCollectionPage;
3335
import com.microsoft.graph.requests.ConditionalAccessPolicyCollectionPage;
36+
import com.microsoft.graph.requests.UnifiedRoleManagementPolicyCollectionPage;
37+
import com.microsoft.graph.requests.UnifiedRoleManagementPolicyAssignmentCollectionPage;
3438

3539

3640
import com.google.gson.JsonObject;
@@ -164,6 +168,24 @@ public class PolicyRoot extends Entity implements IJsonBackedObject {
164168
@Nullable
165169
public IdentitySecurityDefaultsEnforcementPolicy identitySecurityDefaultsEnforcementPolicy;
166170

171+
/**
172+
* The Role Management Policies.
173+
* Represents the role management policies.
174+
*/
175+
@SerializedName(value = "roleManagementPolicies", alternate = {"RoleManagementPolicies"})
176+
@Expose
177+
@Nullable
178+
public UnifiedRoleManagementPolicyCollectionPage roleManagementPolicies;
179+
180+
/**
181+
* The Role Management Policy Assignments.
182+
* Represents the role management policy assignments.
183+
*/
184+
@SerializedName(value = "roleManagementPolicyAssignments", alternate = {"RoleManagementPolicyAssignments"})
185+
@Expose
186+
@Nullable
187+
public UnifiedRoleManagementPolicyAssignmentCollectionPage roleManagementPolicyAssignments;
188+
167189

168190
/**
169191
* Sets the raw JSON object
@@ -205,5 +227,13 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
205227
if (json.has("conditionalAccessPolicies")) {
206228
conditionalAccessPolicies = serializer.deserializeObject(json.get("conditionalAccessPolicies"), ConditionalAccessPolicyCollectionPage.class);
207229
}
230+
231+
if (json.has("roleManagementPolicies")) {
232+
roleManagementPolicies = serializer.deserializeObject(json.get("roleManagementPolicies"), UnifiedRoleManagementPolicyCollectionPage.class);
233+
}
234+
235+
if (json.has("roleManagementPolicyAssignments")) {
236+
roleManagementPolicyAssignments = serializer.deserializeObject(json.get("roleManagementPolicyAssignments"), UnifiedRoleManagementPolicyAssignmentCollectionPage.class);
237+
}
208238
}
209239
}

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

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,21 @@
1111
import com.microsoft.graph.http.BaseCollectionPage;
1212
import com.microsoft.graph.models.UnifiedRoleAssignment;
1313
import com.microsoft.graph.models.UnifiedRoleDefinition;
14+
import com.microsoft.graph.models.UnifiedRoleAssignmentScheduleInstance;
15+
import com.microsoft.graph.models.UnifiedRoleAssignmentScheduleRequest;
16+
import com.microsoft.graph.models.UnifiedRoleAssignmentSchedule;
17+
import com.microsoft.graph.models.UnifiedRoleEligibilityScheduleInstance;
18+
import com.microsoft.graph.models.UnifiedRoleEligibilityScheduleRequest;
19+
import com.microsoft.graph.models.UnifiedRoleEligibilitySchedule;
1420
import com.microsoft.graph.models.Entity;
1521
import com.microsoft.graph.requests.UnifiedRoleAssignmentCollectionPage;
1622
import com.microsoft.graph.requests.UnifiedRoleDefinitionCollectionPage;
23+
import com.microsoft.graph.requests.UnifiedRoleAssignmentScheduleInstanceCollectionPage;
24+
import com.microsoft.graph.requests.UnifiedRoleAssignmentScheduleRequestCollectionPage;
25+
import com.microsoft.graph.requests.UnifiedRoleAssignmentScheduleCollectionPage;
26+
import com.microsoft.graph.requests.UnifiedRoleEligibilityScheduleInstanceCollectionPage;
27+
import com.microsoft.graph.requests.UnifiedRoleEligibilityScheduleRequestCollectionPage;
28+
import com.microsoft.graph.requests.UnifiedRoleEligibilityScheduleCollectionPage;
1729

1830

1931
import com.google.gson.JsonObject;
@@ -48,6 +60,60 @@ public class RbacApplication extends Entity implements IJsonBackedObject {
4860
@Nullable
4961
public UnifiedRoleDefinitionCollectionPage roleDefinitions;
5062

63+
/**
64+
* The Role Assignment Schedule Instances.
65+
*
66+
*/
67+
@SerializedName(value = "roleAssignmentScheduleInstances", alternate = {"RoleAssignmentScheduleInstances"})
68+
@Expose
69+
@Nullable
70+
public UnifiedRoleAssignmentScheduleInstanceCollectionPage roleAssignmentScheduleInstances;
71+
72+
/**
73+
* The Role Assignment Schedule Requests.
74+
*
75+
*/
76+
@SerializedName(value = "roleAssignmentScheduleRequests", alternate = {"RoleAssignmentScheduleRequests"})
77+
@Expose
78+
@Nullable
79+
public UnifiedRoleAssignmentScheduleRequestCollectionPage roleAssignmentScheduleRequests;
80+
81+
/**
82+
* The Role Assignment Schedules.
83+
*
84+
*/
85+
@SerializedName(value = "roleAssignmentSchedules", alternate = {"RoleAssignmentSchedules"})
86+
@Expose
87+
@Nullable
88+
public UnifiedRoleAssignmentScheduleCollectionPage roleAssignmentSchedules;
89+
90+
/**
91+
* The Role Eligibility Schedule Instances.
92+
*
93+
*/
94+
@SerializedName(value = "roleEligibilityScheduleInstances", alternate = {"RoleEligibilityScheduleInstances"})
95+
@Expose
96+
@Nullable
97+
public UnifiedRoleEligibilityScheduleInstanceCollectionPage roleEligibilityScheduleInstances;
98+
99+
/**
100+
* The Role Eligibility Schedule Requests.
101+
*
102+
*/
103+
@SerializedName(value = "roleEligibilityScheduleRequests", alternate = {"RoleEligibilityScheduleRequests"})
104+
@Expose
105+
@Nullable
106+
public UnifiedRoleEligibilityScheduleRequestCollectionPage roleEligibilityScheduleRequests;
107+
108+
/**
109+
* The Role Eligibility Schedules.
110+
*
111+
*/
112+
@SerializedName(value = "roleEligibilitySchedules", alternate = {"RoleEligibilitySchedules"})
113+
@Expose
114+
@Nullable
115+
public UnifiedRoleEligibilityScheduleCollectionPage roleEligibilitySchedules;
116+
51117

52118
/**
53119
* Sets the raw JSON object
@@ -65,5 +131,29 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
65131
if (json.has("roleDefinitions")) {
66132
roleDefinitions = serializer.deserializeObject(json.get("roleDefinitions"), UnifiedRoleDefinitionCollectionPage.class);
67133
}
134+
135+
if (json.has("roleAssignmentScheduleInstances")) {
136+
roleAssignmentScheduleInstances = serializer.deserializeObject(json.get("roleAssignmentScheduleInstances"), UnifiedRoleAssignmentScheduleInstanceCollectionPage.class);
137+
}
138+
139+
if (json.has("roleAssignmentScheduleRequests")) {
140+
roleAssignmentScheduleRequests = serializer.deserializeObject(json.get("roleAssignmentScheduleRequests"), UnifiedRoleAssignmentScheduleRequestCollectionPage.class);
141+
}
142+
143+
if (json.has("roleAssignmentSchedules")) {
144+
roleAssignmentSchedules = serializer.deserializeObject(json.get("roleAssignmentSchedules"), UnifiedRoleAssignmentScheduleCollectionPage.class);
145+
}
146+
147+
if (json.has("roleEligibilityScheduleInstances")) {
148+
roleEligibilityScheduleInstances = serializer.deserializeObject(json.get("roleEligibilityScheduleInstances"), UnifiedRoleEligibilityScheduleInstanceCollectionPage.class);
149+
}
150+
151+
if (json.has("roleEligibilityScheduleRequests")) {
152+
roleEligibilityScheduleRequests = serializer.deserializeObject(json.get("roleEligibilityScheduleRequests"), UnifiedRoleEligibilityScheduleRequestCollectionPage.class);
153+
}
154+
155+
if (json.has("roleEligibilitySchedules")) {
156+
roleEligibilitySchedules = serializer.deserializeObject(json.get("roleEligibilitySchedules"), UnifiedRoleEligibilityScheduleCollectionPage.class);
157+
}
68158
}
69159
}

0 commit comments

Comments
 (0)