Skip to content

Commit 0df010d

Browse files
baywetbaywet
authored
Merge pull request #682 from microsoftgraph/v1.0/pipelinebuild/42274
Generated v1.0 models and request builders using Typewriter
2 parents cf0d0de + 795738e commit 0df010d

File tree

605 files changed

+122028
-62682
lines changed

Some content is hidden

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

605 files changed

+122028
-62682
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:2.8.1'
22+
implementation 'com.microsoft.graph:microsoft-graph:2.9.0'
2323
}
2424
```
2525

@@ -31,7 +31,7 @@ Add the dependency in `dependencies` in pom.xml
3131
<dependency>
3232
<groupId>com.microsoft.graph</groupId>
3333
<artifactId>microsoft-graph</artifactId>
34-
<version>2.8.1</version>
34+
<version>2.9.0</version>
3535
</dependency>
3636
```
3737

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

122122

123123

124+

‎gradle.properties‎

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

3333
#These values are used to run functional tests
@@ -47,3 +47,4 @@ mavenCentralPublishingEnabled=false
4747

4848

4949

50+

‎src/main/java/com/microsoft/graph/core/Constants.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ private Constants() {
3030
public static final String PASSWORD = "password";
3131
public static final String TENANTID = "tenantid";
3232
public static final String CLIENTSECRET = "clientsecret";
33-
public static final String VERSION_NAME = "2.8.1";
33+
public static final String VERSION_NAME = "2.9.0";
3434
}
3535

3636

3737

3838

3939

4040

41+

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ public class AadUserConversationMember extends ConversationMember implements IJs
3232
@Expose
3333
public String email;
3434

35+
/**
36+
* The Tenant Id.
37+
* TenantId which the Azure AD user belongs to.
38+
*/
39+
@SerializedName(value = "tenantId", alternate = {"TenantId"})
40+
@Expose
41+
public String tenantId;
42+
3543
/**
3644
* The User Id.
3745
* The GUID of the user.

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

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

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

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
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.extensions;
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.generated.AgreementAcceptanceState;
12+
import com.microsoft.graph.models.extensions.Entity;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.annotations.SerializedName;
17+
import com.google.gson.annotations.Expose;
18+
19+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
20+
21+
/**
22+
* The class for the Agreement Acceptance.
23+
*/
24+
public class AgreementAcceptance extends Entity implements IJsonBackedObject {
25+
26+
27+
/**
28+
* The Agreement File Id.
29+
* ID of the agreement file accepted by the user.
30+
*/
31+
@SerializedName(value = "agreementFileId", alternate = {"AgreementFileId"})
32+
@Expose
33+
public String agreementFileId;
34+
35+
/**
36+
* The Agreement Id.
37+
* ID of the agreement.
38+
*/
39+
@SerializedName(value = "agreementId", alternate = {"AgreementId"})
40+
@Expose
41+
public String agreementId;
42+
43+
/**
44+
* The Device Display Name.
45+
* The display name of the device used for accepting the agreement.
46+
*/
47+
@SerializedName(value = "deviceDisplayName", alternate = {"DeviceDisplayName"})
48+
@Expose
49+
public String deviceDisplayName;
50+
51+
/**
52+
* The Device Id.
53+
* The unique identifier of the device used for accepting the agreement.
54+
*/
55+
@SerializedName(value = "deviceId", alternate = {"DeviceId"})
56+
@Expose
57+
public String deviceId;
58+
59+
/**
60+
* The Device OSType.
61+
* The operating system used for accepting the agreement.
62+
*/
63+
@SerializedName(value = "deviceOSType", alternate = {"DeviceOSType"})
64+
@Expose
65+
public String deviceOSType;
66+
67+
/**
68+
* The Device OSVersion.
69+
* The operating system version of the device used for accepting the agreement.
70+
*/
71+
@SerializedName(value = "deviceOSVersion", alternate = {"DeviceOSVersion"})
72+
@Expose
73+
public String deviceOSVersion;
74+
75+
/**
76+
* The Expiration Date Time.
77+
* 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'
78+
*/
79+
@SerializedName(value = "expirationDateTime", alternate = {"ExpirationDateTime"})
80+
@Expose
81+
public java.util.Calendar expirationDateTime;
82+
83+
/**
84+
* The Recorded Date Time.
85+
* 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 = "recordedDateTime", alternate = {"RecordedDateTime"})
88+
@Expose
89+
public java.util.Calendar recordedDateTime;
90+
91+
/**
92+
* The State.
93+
* Possible values are: accepted, declined.
94+
*/
95+
@SerializedName(value = "state", alternate = {"State"})
96+
@Expose
97+
public AgreementAcceptanceState state;
98+
99+
/**
100+
* The User Display Name.
101+
* Display name of the user when the acceptance was recorded.
102+
*/
103+
@SerializedName(value = "userDisplayName", alternate = {"UserDisplayName"})
104+
@Expose
105+
public String userDisplayName;
106+
107+
/**
108+
* The User Email.
109+
* Email of the user when the acceptance was recorded.
110+
*/
111+
@SerializedName(value = "userEmail", alternate = {"UserEmail"})
112+
@Expose
113+
public String userEmail;
114+
115+
/**
116+
* The User Id.
117+
* ID of the user who accepted the agreement.
118+
*/
119+
@SerializedName(value = "userId", alternate = {"UserId"})
120+
@Expose
121+
public String userId;
122+
123+
/**
124+
* The User Principal Name.
125+
* UPN of the user when the acceptance was recorded.
126+
*/
127+
@SerializedName(value = "userPrincipalName", alternate = {"UserPrincipalName"})
128+
@Expose
129+
public String userPrincipalName;
130+
131+
132+
/**
133+
* The raw representation of this class
134+
*/
135+
private JsonObject rawObject;
136+
137+
/**
138+
* The serializer
139+
*/
140+
private ISerializer serializer;
141+
142+
/**
143+
* Gets the raw representation of this class
144+
*
145+
* @return the raw representation of this class
146+
*/
147+
public JsonObject getRawObject() {
148+
return rawObject;
149+
}
150+
151+
/**
152+
* Gets serializer
153+
*
154+
* @return the serializer
155+
*/
156+
protected ISerializer getSerializer() {
157+
return serializer;
158+
}
159+
160+
/**
161+
* Sets the raw JSON object
162+
*
163+
* @param serializer the serializer
164+
* @param json the JSON object to set this object to
165+
*/
166+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
167+
this.serializer = serializer;
168+
rawObject = json;
169+
170+
}
171+
}

0 commit comments

Comments
 (0)