Skip to content

Commit 2c700db

Browse files
authored
Merge pull request #226 from microsoftgraph/v1.0/pipelinebuild/1078570
Generated v1.0 models and request builders using Typewriter
2 parents decf5d5 + 9c751de commit 2c700db

File tree

66 files changed

+3075
-31
lines changed

Some content is hidden

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

66 files changed

+3075
-31
lines changed

src/main/java/com/microsoft/graph/models/extensions/AndroidCompliancePolicy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ public class AndroidCompliancePolicy extends DeviceCompliancePolicy implements I
6363

6464
/**
6565
* The Password Expiration Days.
66-
* Number of days before the password expires. Valid values 1 to 65535
66+
* Number of days before the password expires. Valid values 1 to 365
6767
*/
6868
@SerializedName("passwordExpirationDays")
6969
@Expose
7070
public Integer passwordExpirationDays;
7171

7272
/**
7373
* The Password Previous Password Block Count.
74-
* Number of previous passwords to block.
74+
* Number of previous passwords to block. Valid values 1 to 24
7575
*/
7676
@SerializedName("passwordPreviousPasswordBlockCount")
7777
@Expose

src/main/java/com/microsoft/graph/models/extensions/AndroidGeneralDeviceConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public class AndroidGeneralDeviceConfiguration extends DeviceConfiguration imple
233233

234234
/**
235235
* The Password Sign In Failure Count Before Factory Reset.
236-
* Number of sign in failures allowed before factory reset. Valid values 4 to 11
236+
* Number of sign in failures allowed before factory reset. Valid values 1 to 16
237237
*/
238238
@SerializedName("passwordSignInFailureCountBeforeFactoryReset")
239239
@Expose

src/main/java/com/microsoft/graph/models/extensions/AndroidWorkProfileCompliancePolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class AndroidWorkProfileCompliancePolicy extends DeviceCompliancePolicy i
7171

7272
/**
7373
* The Password Previous Password Block Count.
74-
* Number of previous passwords to block.
74+
* Number of previous passwords to block. Valid values 1 to 24
7575
*/
7676
@SerializedName("passwordPreviousPasswordBlockCount")
7777
@Expose

src/main/java/com/microsoft/graph/models/extensions/AndroidWorkProfileGeneralDeviceConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class AndroidWorkProfileGeneralDeviceConfiguration extends DeviceConfigur
8080

8181
/**
8282
* The Password Sign In Failure Count Before Factory Reset.
83-
* Number of sign in failures allowed before factory reset. Valid values 4 to 11
83+
* Number of sign in failures allowed before factory reset. Valid values 1 to 16
8484
*/
8585
@SerializedName("passwordSignInFailureCountBeforeFactoryReset")
8686
@Expose
@@ -272,7 +272,7 @@ public class AndroidWorkProfileGeneralDeviceConfiguration extends DeviceConfigur
272272

273273
/**
274274
* The Work Profile Password Sign In Failure Count Before Factory Reset.
275-
* Number of sign in failures allowed before work profile is removed and all corporate data deleted. Valid values 4 to 11
275+
* Number of sign in failures allowed before work profile is removed and all corporate data deleted. Valid values 1 to 16
276276
*/
277277
@SerializedName("workProfilePasswordSignInFailureCountBeforeFactoryReset")
278278
@Expose

src/main/java/com/microsoft/graph/models/extensions/DateTimeTimeZone.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public final AdditionalDataManager additionalDataManager() {
3838

3939
/**
4040
* The Date Time.
41-
* A single point of time in a combined date and time representation (<date>T<time>).
41+
* A single point of time in a combined date and time representation ({date}T{time}; for example, 2017-08-29T04:00:00.0000000).
4242
*/
4343
@SerializedName("dateTime")
4444
@Expose

src/main/java/com/microsoft/graph/models/extensions/Device.java

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,20 @@ public class Device extends DirectoryObject implements IJsonBackedObject {
5151

5252
/**
5353
* The Approximate Last Sign In Date Time.
54-
* 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' Read-only.
54+
* 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'. Read-only.
5555
*/
5656
@SerializedName("approximateLastSignInDateTime")
5757
@Expose
5858
public java.util.Calendar approximateLastSignInDateTime;
5959

60+
/**
61+
* The Compliance Expiration Date Time.
62+
* The timestamp when the device is no longer deemed compliant. 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'. Read-only.
63+
*/
64+
@SerializedName("complianceExpirationDateTime")
65+
@Expose
66+
public java.util.Calendar complianceExpirationDateTime;
67+
6068
/**
6169
* The Device Id.
6270
* Unique identifier set by Azure Device Registration Service at the time of registration.
@@ -145,6 +153,22 @@ public class Device extends DirectoryObject implements IJsonBackedObject {
145153
@Expose
146154
public java.util.List<String> physicalIds;
147155

156+
/**
157+
* The Profile Type.
158+
* The profile type of the device. Possible values:RegisteredDevice (default)SecureVMPrinterSharedIoT
159+
*/
160+
@SerializedName("profileType")
161+
@Expose
162+
public String profileType;
163+
164+
/**
165+
* The System Labels.
166+
* List of labels applied to the device by the system.
167+
*/
168+
@SerializedName("systemLabels")
169+
@Expose
170+
public java.util.List<String> systemLabels;
171+
148172
/**
149173
* The Trust Type.
150174
* Type of trust for the joined device. Read-only. Possible values: Workplace - indicates bring your own personal devicesAzureAd - Cloud only joined devicesServerAd - on-premises domain joined devices joined to Azure AD. For more details, see Introduction to device management in Azure Active Directory
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
// ------------------------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
3+
// ------------------------------------------------------------------------------
4+
5+
package com.microsoft.graph.models.extensions;
6+
import com.microsoft.graph.concurrency.*;
7+
import com.microsoft.graph.core.*;
8+
import com.microsoft.graph.http.*;
9+
import com.microsoft.graph.options.*;
10+
import com.microsoft.graph.serializer.*;
11+
import java.util.Arrays;
12+
import java.util.EnumSet;
13+
import com.microsoft.graph.models.extensions.DirectoryObject;
14+
15+
16+
import com.google.gson.JsonObject;
17+
import com.google.gson.JsonElement;
18+
import com.google.gson.annotations.*;
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
22+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
23+
24+
/**
25+
* The class for the Directory Object Partner Reference.
26+
*/
27+
public class DirectoryObjectPartnerReference extends DirectoryObject implements IJsonBackedObject {
28+
29+
30+
/**
31+
* The Description.
32+
* Description of the object returned. Read-only.
33+
*/
34+
@SerializedName("description")
35+
@Expose
36+
public String description;
37+
38+
/**
39+
* The Display Name.
40+
* Name of directory object being returned, like group or application. Read-only.
41+
*/
42+
@SerializedName("displayName")
43+
@Expose
44+
public String displayName;
45+
46+
/**
47+
* The External Partner Tenant Id.
48+
* The tenant identifier for the partner tenant. Read-only.
49+
*/
50+
@SerializedName("externalPartnerTenantId")
51+
@Expose
52+
public java.util.UUID externalPartnerTenantId;
53+
54+
/**
55+
* The Object Type.
56+
* The type of the referenced object in the partner tenant. Read-only.
57+
*/
58+
@SerializedName("objectType")
59+
@Expose
60+
public String objectType;
61+
62+
63+
/**
64+
* The raw representation of this class
65+
*/
66+
private JsonObject rawObject;
67+
68+
/**
69+
* The serializer
70+
*/
71+
private ISerializer serializer;
72+
73+
/**
74+
* Gets the raw representation of this class
75+
*
76+
* @return the raw representation of this class
77+
*/
78+
public JsonObject getRawObject() {
79+
return rawObject;
80+
}
81+
82+
/**
83+
* Gets serializer
84+
*
85+
* @return the serializer
86+
*/
87+
protected ISerializer getSerializer() {
88+
return serializer;
89+
}
90+
91+
/**
92+
* Sets the raw JSON object
93+
*
94+
* @param serializer the serializer
95+
* @param json the JSON object to set this object to
96+
*/
97+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
98+
this.serializer = serializer;
99+
rawObject = json;
100+
101+
}
102+
}

src/main/java/com/microsoft/graph/models/extensions/Domain.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,22 @@ public class Domain extends Entity implements IJsonBackedObject {
9090
@Expose
9191
public Boolean isVerified;
9292

93+
/**
94+
* The Password Notification Window In Days.
95+
* Specifies the number of days before a user receives notification that their password will expire. If the property is not set, a default value of 14 days will be used.
96+
*/
97+
@SerializedName("passwordNotificationWindowInDays")
98+
@Expose
99+
public Integer passwordNotificationWindowInDays;
100+
101+
/**
102+
* The Password Validity Period In Days.
103+
* Specifies the length of time that a password is valid before it must be changed. If the property is not set, a default value of 90 days will be used.
104+
*/
105+
@SerializedName("passwordValidityPeriodInDays")
106+
@Expose
107+
public Integer passwordValidityPeriodInDays;
108+
93109
/**
94110
* The Supported Services.
95111
* The capabilities assigned to the domain.Can include 0, 1 or more of following values: Email, Sharepoint, EmailInternalRelayOnly, OfficeCommunicationsOnline, SharePointDefaultDomain, FullRedelegation, SharePointPublic, OrgIdAuthentication, Yammer, Intune The values which you can add/remove using Graph API include: Email, OfficeCommunicationsOnline, YammerNot nullable

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.microsoft.graph.models.extensions.EducationStudent;
1717
import com.microsoft.graph.models.extensions.EducationTeacher;
1818
import com.microsoft.graph.models.extensions.IdentitySet;
19-
import com.microsoft.graph.models.extensions.EducationRelatedContact;
2019
import com.microsoft.graph.models.extensions.AssignedLicense;
2120
import com.microsoft.graph.models.extensions.AssignedPlan;
2221
import com.microsoft.graph.models.extensions.PasswordProfile;
@@ -109,14 +108,6 @@ public class EducationUser extends Entity implements IJsonBackedObject {
109108
@Expose
110109
public IdentitySet createdBy;
111110

112-
/**
113-
* The Related Contacts.
114-
* Set of contacts related to the user. This optional property must be specified in a $select clause and can only be retrieved for an individual user.
115-
*/
116-
@SerializedName("relatedContacts")
117-
@Expose
118-
public java.util.List<EducationRelatedContact> relatedContacts;
119-
120111
/**
121112
* The Account Enabled.
122113
* True if the account is enabled; otherwise, false. This property is required when a user is created. Supports $filter.

src/main/java/com/microsoft/graph/models/extensions/IBaseGraphServiceClient.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,21 @@ public interface IBaseGraphServiceClient extends IBaseClient {
368368
*/
369369
IDataPolicyOperationRequestBuilder dataPolicyOperations(final String id);
370370

371+
/**
372+
* Gets the collection of IdentityProviders objects
373+
*
374+
* @return the request builder for the collection of IdentityProviders objects
375+
*/
376+
IIdentityProviderCollectionRequestBuilder identityProviders();
377+
378+
/**
379+
* Gets a single IdentityProviders
380+
*
381+
* @param id the id of the IdentityProviders to retrieve
382+
* @return the request builder for the IdentityProviders object
383+
*/
384+
IIdentityProviderRequestBuilder identityProviders(final String id);
385+
371386
/**
372387
* Gets the GraphServiceRequestBuilder
373388
*

0 commit comments

Comments
 (0)