Skip to content

Commit dc06f62

Browse files
baywetbaywet
committed
Merge branch 'dev' into feature/v3
2 parents dacb24a + f4ea641 commit dc06f62

File tree

513 files changed

+27445
-450
lines changed

Some content is hidden

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

513 files changed

+27445
-450
lines changed

‎.github/workflows/create-v1.0-pull-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
env:
3838
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3939
MESSAGE_TITLE: Generated v1.0 models and request builders using Typewriter
40-
MESSAGE_BODY: "This pull request was automatically created by the GitHub Action, **${{github.workflow}}**. \n\n The commit hash is _${{github.sha}}_. \n\n **Important** Check for unexpected deletions or changes in this PR. \n\n cc: @darrelmiller"
40+
MESSAGE_BODY: "This pull request was automatically created by the GitHub Action, **${{github.workflow}}**. \n\n The commit hash is _${{github.sha}}_. \n\n **Important** Check for unexpected deletions or changes in this PR."
4141
REVIEWERS: peombwa,ddyett,zengin,nikithauc,baywet
4242
ASSIGNEDTO: baywet
4343
LABELS: generated

‎src/main/java/com/microsoft/graph/callrecords/models/CallRecord.java‎

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

106106
/**
107107
* The Version.
108-
* Monotonically increasing version of the call record. Higher version call records with the same id includes additional data compared to the lower version.
108+
* Monotonically increasing version of the call record. Higher version call records with the same ID includes additional data compared to the lower version.
109109
*/
110110
@SerializedName(value = "version", alternate = {"Version"})
111111
@Expose

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,18 @@ public class AadUserConversationMember extends ConversationMember implements IJs
3535
@Nullable
3636
public String email;
3737

38+
/**
39+
* The Tenant Id.
40+
* TenantId which the Azure AD user belongs to.
41+
*/
42+
@SerializedName(value = "tenantId", alternate = {"TenantId"})
43+
@Expose
44+
@Nullable
45+
public String tenantId;
46+
3847
/**
3948
* The User Id.
40-
* The guid of the user.
49+
* The GUID of the user.
4150
*/
4251
@SerializedName(value = "userId", alternate = {"UserId"})
4352
@Expose

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class AdministrativeUnit extends DirectoryObject implements IJsonBackedOb
5151

5252
/**
5353
* The Visibility.
54-
* Controls whether the administrative unit and its members are hidden or public. Can be set to HiddenMembership or Public. If not set, default behavior is Public. When set to HiddenMembership, only members of the administrative unit can list other members of the adminstrative unit.
54+
* Controls whether the adminstrative unit and its members are hidden or public. Can be set to HiddenMembership or Public. If not set, default behavior is Public. When set to HiddenMembership, only members of the administrative unit can list other members of the adminstrative unit.
5555
*/
5656
@SerializedName(value = "visibility", alternate = {"Visibility"})
5757
@Expose

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

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
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.TermsExpiration;
13+
import com.microsoft.graph.models.AgreementAcceptance;
14+
import com.microsoft.graph.models.AgreementFile;
15+
import com.microsoft.graph.models.AgreementFileLocalization;
16+
import com.microsoft.graph.models.Entity;
17+
import com.microsoft.graph.requests.AgreementAcceptanceCollectionPage;
18+
import com.microsoft.graph.requests.AgreementFileLocalizationCollectionPage;
19+
20+
21+
import com.google.gson.JsonObject;
22+
import com.google.gson.annotations.SerializedName;
23+
import com.google.gson.annotations.Expose;
24+
import javax.annotation.Nullable;
25+
import javax.annotation.Nonnull;
26+
27+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
28+
29+
/**
30+
* The class for the Agreement.
31+
*/
32+
public class Agreement extends Entity implements IJsonBackedObject {
33+
34+
35+
/**
36+
* The Display Name.
37+
* Display name of the agreement. The display name is used for internal tracking of the agreement but is not shown to end users who view the agreement.
38+
*/
39+
@SerializedName(value = "displayName", alternate = {"DisplayName"})
40+
@Expose
41+
@Nullable
42+
public String displayName;
43+
44+
/**
45+
* The Is Per Device Acceptance Required.
46+
* This setting enables you to require end users to accept this agreement on every device that they are accessing it from. The end user will be required to register their device in Azure AD, if they haven't already done so.
47+
*/
48+
@SerializedName(value = "isPerDeviceAcceptanceRequired", alternate = {"IsPerDeviceAcceptanceRequired"})
49+
@Expose
50+
@Nullable
51+
public Boolean isPerDeviceAcceptanceRequired;
52+
53+
/**
54+
* The Is Viewing Before Acceptance Required.
55+
* Indicates whether the user has to expand the agreement before accepting.
56+
*/
57+
@SerializedName(value = "isViewingBeforeAcceptanceRequired", alternate = {"IsViewingBeforeAcceptanceRequired"})
58+
@Expose
59+
@Nullable
60+
public Boolean isViewingBeforeAcceptanceRequired;
61+
62+
/**
63+
* The Terms Expiration.
64+
* Expiration schedule and frequency of agreement for all users.
65+
*/
66+
@SerializedName(value = "termsExpiration", alternate = {"TermsExpiration"})
67+
@Expose
68+
@Nullable
69+
public TermsExpiration termsExpiration;
70+
71+
/**
72+
* The User Reaccept Required Frequency.
73+
* The duration after which the user must re-accept the terms of use. The value is represented in ISO 8601 format for durations.
74+
*/
75+
@SerializedName(value = "userReacceptRequiredFrequency", alternate = {"UserReacceptRequiredFrequency"})
76+
@Expose
77+
@Nullable
78+
public javax.xml.datatype.Duration userReacceptRequiredFrequency;
79+
80+
/**
81+
* The Acceptances.
82+
* Read-only. Information about acceptances of this agreement.
83+
*/
84+
@SerializedName(value = "acceptances", alternate = {"Acceptances"})
85+
@Expose
86+
@Nullable
87+
public AgreementAcceptanceCollectionPage acceptances;
88+
89+
/**
90+
* The File.
91+
* Default PDF linked to this agreement.
92+
*/
93+
@SerializedName(value = "file", alternate = {"File"})
94+
@Expose
95+
@Nullable
96+
public AgreementFile file;
97+
98+
/**
99+
* The Files.
100+
* PDFs linked to this agreement. Note: This property is in the process of being deprecated. Use the file property instead.
101+
*/
102+
@SerializedName(value = "files", alternate = {"Files"})
103+
@Expose
104+
@Nullable
105+
public AgreementFileLocalizationCollectionPage files;
106+
107+
108+
/**
109+
* Sets the raw JSON object
110+
*
111+
* @param serializer the serializer
112+
* @param json the JSON object to set this object to
113+
*/
114+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
115+
116+
117+
if (json.has("acceptances")) {
118+
acceptances = serializer.deserializeObject(json.get("acceptances"), AgreementAcceptanceCollectionPage.class);
119+
}
120+
121+
if (json.has("files")) {
122+
files = serializer.deserializeObject(json.get("files"), AgreementFileLocalizationCollectionPage.class);
123+
}
124+
}
125+
}

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

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
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.AgreementAcceptanceState;
12+
import com.microsoft.graph.models.Entity;
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 Agreement Acceptance.
25+
*/
26+
public class AgreementAcceptance extends Entity implements IJsonBackedObject {
27+
28+
29+
/**
30+
* The Agreement File Id.
31+
* ID of the agreement file accepted by the user.
32+
*/
33+
@SerializedName(value = "agreementFileId", alternate = {"AgreementFileId"})
34+
@Expose
35+
@Nullable
36+
public String agreementFileId;
37+
38+
/**
39+
* The Agreement Id.
40+
* ID of the agreement.
41+
*/
42+
@SerializedName(value = "agreementId", alternate = {"AgreementId"})
43+
@Expose
44+
@Nullable
45+
public String agreementId;
46+
47+
/**
48+
* The Device Display Name.
49+
* The display name of the device used for accepting the agreement.
50+
*/
51+
@SerializedName(value = "deviceDisplayName", alternate = {"DeviceDisplayName"})
52+
@Expose
53+
@Nullable
54+
public String deviceDisplayName;
55+
56+
/**
57+
* The Device Id.
58+
* The unique identifier of the device used for accepting the agreement.
59+
*/
60+
@SerializedName(value = "deviceId", alternate = {"DeviceId"})
61+
@Expose
62+
@Nullable
63+
public String deviceId;
64+
65+
/**
66+
* The Device OSType.
67+
* The operating system used for accepting the agreement.
68+
*/
69+
@SerializedName(value = "deviceOSType", alternate = {"DeviceOSType"})
70+
@Expose
71+
@Nullable
72+
public String deviceOSType;
73+
74+
/**
75+
* The Device OSVersion.
76+
* The operating system version of the device used for accepting the agreement.
77+
*/
78+
@SerializedName(value = "deviceOSVersion", alternate = {"DeviceOSVersion"})
79+
@Expose
80+
@Nullable
81+
public String deviceOSVersion;
82+
83+
/**
84+
* The Expiration Date Time.
85+
* The expiration date time of the acceptance. 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 would look like this: '2014-01-01T00:00:00Z'
86+
*/
87+
@SerializedName(value = "expirationDateTime", alternate = {"ExpirationDateTime"})
88+
@Expose
89+
@Nullable
90+
public java.time.OffsetDateTime expirationDateTime;
91+
92+
/**
93+
* The Recorded Date Time.
94+
* 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 would look like this: '2014-01-01T00:00:00Z'
95+
*/
96+
@SerializedName(value = "recordedDateTime", alternate = {"RecordedDateTime"})
97+
@Expose
98+
@Nullable
99+
public java.time.OffsetDateTime recordedDateTime;
100+
101+
/**
102+
* The State.
103+
* Possible values are: accepted, declined.
104+
*/
105+
@SerializedName(value = "state", alternate = {"State"})
106+
@Expose
107+
@Nullable
108+
public AgreementAcceptanceState state;
109+
110+
/**
111+
* The User Display Name.
112+
* Display name of the user when the acceptance was recorded.
113+
*/
114+
@SerializedName(value = "userDisplayName", alternate = {"UserDisplayName"})
115+
@Expose
116+
@Nullable
117+
public String userDisplayName;
118+
119+
/**
120+
* The User Email.
121+
* Email of the user when the acceptance was recorded.
122+
*/
123+
@SerializedName(value = "userEmail", alternate = {"UserEmail"})
124+
@Expose
125+
@Nullable
126+
public String userEmail;
127+
128+
/**
129+
* The User Id.
130+
* ID of the user who accepted the agreement.
131+
*/
132+
@SerializedName(value = "userId", alternate = {"UserId"})
133+
@Expose
134+
@Nullable
135+
public String userId;
136+
137+
/**
138+
* The User Principal Name.
139+
* UPN of the user when the acceptance was recorded.
140+
*/
141+
@SerializedName(value = "userPrincipalName", alternate = {"UserPrincipalName"})
142+
@Expose
143+
@Nullable
144+
public String userPrincipalName;
145+
146+
147+
/**
148+
* Sets the raw JSON object
149+
*
150+
* @param serializer the serializer
151+
* @param json the JSON object to set this object to
152+
*/
153+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
154+
155+
}
156+
}

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Template Source: Enum.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+
8+
9+
/**
10+
* The Enum Agreement Acceptance State.
11+
*/
12+
public enum AgreementAcceptanceState
13+
{
14+
/**
15+
* accepted
16+
*/
17+
ACCEPTED,
18+
/**
19+
* declined
20+
*/
21+
DECLINED,
22+
/**
23+
* unknown Future Value
24+
*/
25+
UNKNOWN_FUTURE_VALUE,
26+
/**
27+
* For AgreementAcceptanceState values that were not expected from the service
28+
*/
29+
UNEXPECTED_VALUE
30+
}

0 commit comments

Comments
 (0)