Skip to content

Commit ff496f6

Browse files
baywetbaywet
authored
Merge pull request #1029 from microsoftgraph/v1.0/pipelinebuild/70473
Generated v1.0 models and request builders using Typewriter
2 parents d374aa0 + 2e528cc commit ff496f6

File tree

44 files changed

+1675
-14
lines changed

Some content is hidden

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

44 files changed

+1675
-14
lines changed

‎CHANGELOG.md‎

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

1212
### Changed
1313

14+
## [5.17.0] - 2022-03-17
15+
16+
### Added
17+
18+
- AccessPackageApprovalStage, TargetApplicationOwners, AllowedTargetScope, & TargetManager models.
19+
- AccessPackageAssignment(AprovalSettings, Policy, ReviewSettings, and etc) models.
20+
- AccessPackageAssignment related requests.
21+
22+
### Changed
23+
24+
- Generated v1.0 models and request builders using Typewriter.
25+
- Dependencies in AccessPackageAssignment and it's related classes.
26+
- Dependencies in EntitlementManagement and it's request builder.
27+
1428
## [5.16.0] - 2022-03-10
1529

1630
### 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.16.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.17.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.16.0</version>
39+
<version>5.17.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -150,3 +150,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
150150

151151

152152

153+

‎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 = 16
29+
mavenMinorVersion = 17
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -71,5 +71,6 @@ mavenCentralPublishingEnabled=false
7171

7272

7373

74+
7475

7576

‎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.16.0";
21+
public static final String VERSION_NAME = "5.17.0";
2222
}
2323

2424

@@ -48,5 +48,6 @@ private Constants() {
4848

4949

5050

51+
5152

5253

‎src/main/java/com/microsoft/graph/models/AccessPackage.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
import com.microsoft.graph.serializer.IJsonBackedObject;
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
11+
import com.microsoft.graph.http.BaseCollectionPage;
12+
import com.microsoft.graph.models.AccessPackageAssignmentPolicy;
1113
import com.microsoft.graph.models.AccessPackageCatalog;
1214
import com.microsoft.graph.models.Entity;
15+
import com.microsoft.graph.requests.AccessPackageAssignmentPolicyCollectionPage;
1316

1417

1518
import com.google.gson.JsonObject;
@@ -71,6 +74,15 @@ public class AccessPackage extends Entity implements IJsonBackedObject {
7174
@Nullable
7275
public java.time.OffsetDateTime modifiedDateTime;
7376

77+
/**
78+
* The Assignment Policies.
79+
*
80+
*/
81+
@SerializedName(value = "assignmentPolicies", alternate = {"AssignmentPolicies"})
82+
@Expose
83+
@Nullable
84+
public AccessPackageAssignmentPolicyCollectionPage assignmentPolicies;
85+
7486
/**
7587
* The Catalog.
7688
* Read-only. Nullable.
@@ -89,5 +101,9 @@ public class AccessPackage extends Entity implements IJsonBackedObject {
89101
*/
90102
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
91103

104+
105+
if (json.has("assignmentPolicies")) {
106+
assignmentPolicies = serializer.deserializeObject(json.get("assignmentPolicies"), AccessPackageAssignmentPolicyCollectionPage.class);
107+
}
92108
}
93109
}

‎src/main/java/com/microsoft/graph/models/AccessPackageApprovalStage.java‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
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.SubjectSet;
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 Access Package Approval Stage.
25+
*/
26+
public class AccessPackageApprovalStage 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 Duration Before Automatic Denial.
44+
*
45+
*/
46+
@SerializedName(value = "durationBeforeAutomaticDenial", alternate = {"DurationBeforeAutomaticDenial"})
47+
@Expose
48+
@Nullable
49+
public javax.xml.datatype.Duration durationBeforeAutomaticDenial;
50+
51+
/**
52+
* The Duration Before Escalation.
53+
*
54+
*/
55+
@SerializedName(value = "durationBeforeEscalation", alternate = {"DurationBeforeEscalation"})
56+
@Expose
57+
@Nullable
58+
public javax.xml.datatype.Duration durationBeforeEscalation;
59+
60+
/**
61+
* The Escalation Approvers.
62+
*
63+
*/
64+
@SerializedName(value = "escalationApprovers", alternate = {"EscalationApprovers"})
65+
@Expose
66+
@Nullable
67+
public java.util.List<SubjectSet> escalationApprovers;
68+
69+
/**
70+
* The Fallback Escalation Approvers.
71+
*
72+
*/
73+
@SerializedName(value = "fallbackEscalationApprovers", alternate = {"FallbackEscalationApprovers"})
74+
@Expose
75+
@Nullable
76+
public java.util.List<SubjectSet> fallbackEscalationApprovers;
77+
78+
/**
79+
* The Fallback Primary Approvers.
80+
*
81+
*/
82+
@SerializedName(value = "fallbackPrimaryApprovers", alternate = {"FallbackPrimaryApprovers"})
83+
@Expose
84+
@Nullable
85+
public java.util.List<SubjectSet> fallbackPrimaryApprovers;
86+
87+
/**
88+
* The Is Approver Justification Required.
89+
*
90+
*/
91+
@SerializedName(value = "isApproverJustificationRequired", alternate = {"IsApproverJustificationRequired"})
92+
@Expose
93+
@Nullable
94+
public Boolean isApproverJustificationRequired;
95+
96+
/**
97+
* The Is Escalation Enabled.
98+
*
99+
*/
100+
@SerializedName(value = "isEscalationEnabled", alternate = {"IsEscalationEnabled"})
101+
@Expose
102+
@Nullable
103+
public Boolean isEscalationEnabled;
104+
105+
/**
106+
* The Primary Approvers.
107+
*
108+
*/
109+
@SerializedName(value = "primaryApprovers", alternate = {"PrimaryApprovers"})
110+
@Expose
111+
@Nullable
112+
public java.util.List<SubjectSet> primaryApprovers;
113+
114+
115+
/**
116+
* Sets the raw JSON object
117+
*
118+
* @param serializer the serializer
119+
* @param json the JSON object to set this object to
120+
*/
121+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
122+
123+
}
124+
}

‎src/main/java/com/microsoft/graph/models/AccessPackageAssignment.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.microsoft.graph.models.EntitlementManagementSchedule;
1212
import com.microsoft.graph.models.AccessPackageAssignmentState;
1313
import com.microsoft.graph.models.AccessPackage;
14+
import com.microsoft.graph.models.AccessPackageAssignmentPolicy;
1415
import com.microsoft.graph.models.AccessPackageSubject;
1516
import com.microsoft.graph.models.Entity;
1617

@@ -74,6 +75,15 @@ public class AccessPackageAssignment extends Entity implements IJsonBackedObject
7475
@Nullable
7576
public AccessPackage accessPackage;
7677

78+
/**
79+
* The Assignment Policy.
80+
*
81+
*/
82+
@SerializedName(value = "assignmentPolicy", alternate = {"AssignmentPolicy"})
83+
@Expose
84+
@Nullable
85+
public AccessPackageAssignmentPolicy assignmentPolicy;
86+
7787
/**
7888
* The Target.
7989
* The subject of the access package assignment. Read-only. Nullable. Supports $expand. Supports $filter (eq) on objectId.

‎src/main/java/com/microsoft/graph/models/AccessPackageAssignmentApprovalSettings.java‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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.AccessPackageApprovalStage;
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 Access Package Assignment Approval Settings.
25+
*/
26+
public class AccessPackageAssignmentApprovalSettings 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 Is Approval Required For Add.
44+
*
45+
*/
46+
@SerializedName(value = "isApprovalRequiredForAdd", alternate = {"IsApprovalRequiredForAdd"})
47+
@Expose
48+
@Nullable
49+
public Boolean isApprovalRequiredForAdd;
50+
51+
/**
52+
* The Is Approval Required For Update.
53+
*
54+
*/
55+
@SerializedName(value = "isApprovalRequiredForUpdate", alternate = {"IsApprovalRequiredForUpdate"})
56+
@Expose
57+
@Nullable
58+
public Boolean isApprovalRequiredForUpdate;
59+
60+
/**
61+
* The Stages.
62+
*
63+
*/
64+
@SerializedName(value = "stages", alternate = {"Stages"})
65+
@Expose
66+
@Nullable
67+
public java.util.List<AccessPackageApprovalStage> stages;
68+
69+
70+
/**
71+
* Sets the raw JSON object
72+
*
73+
* @param serializer the serializer
74+
* @param json the JSON object to set this object to
75+
*/
76+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
77+
78+
}
79+
}

0 commit comments

Comments
 (0)