Skip to content

Commit d791675

Browse files
authored
Merge pull request #37 from microsoftgraph/beta/pipelinebuild/3946382
Generated beta models and request builders using Typewriter
2 parents c4d8289 + 6f0f1fc commit d791675

File tree

317 files changed

+20913
-99
lines changed

Some content is hidden

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

317 files changed

+20913
-99
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.microsoft.graph.serializer.AdditionalDataManager;
99
import java.util.EnumSet;
1010
import com.microsoft.graph.models.generated.AndroidDeviceOwnerEnrollmentMode;
11+
import com.microsoft.graph.models.generated.AndroidDeviceOwnerEnrollmentTokenType;
1112
import com.microsoft.graph.models.extensions.MimeContent;
1213
import com.microsoft.graph.models.extensions.Entity;
1314

@@ -72,6 +73,14 @@ public class AndroidDeviceOwnerEnrollmentProfile extends Entity implements IJson
7273
@Expose
7374
public AndroidDeviceOwnerEnrollmentMode enrollmentMode;
7475

76+
/**
77+
* The Enrollment Token Type.
78+
* The enrollment token type for an enrollment profile.
79+
*/
80+
@SerializedName(value = "enrollmentTokenType", alternate = {"EnrollmentTokenType"})
81+
@Expose
82+
public AndroidDeviceOwnerEnrollmentTokenType enrollmentTokenType;
83+
7584
/**
7685
* The Last Modified Date Time.
7786
* Date time the enrollment profile was last modified.

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import com.microsoft.graph.serializer.AdditionalDataManager;
99
import java.util.EnumSet;
1010
import com.microsoft.graph.models.generated.AndroidVpnConnectionType;
11+
import com.microsoft.graph.models.extensions.KeyValue;
12+
import com.microsoft.graph.models.extensions.KeyValuePair;
1113
import com.microsoft.graph.models.extensions.VpnProxyServer;
1214
import com.microsoft.graph.models.extensions.AppListItem;
1315
import com.microsoft.graph.models.extensions.DeviceManagementDerivedCredentialSettings;
@@ -51,6 +53,22 @@ public class AndroidDeviceOwnerVpnConfiguration extends VpnConfiguration impleme
5153
@Expose
5254
public AndroidVpnConnectionType connectionType;
5355

56+
/**
57+
* The Custom Data.
58+
* Custom data to define key/value pairs specific to a VPN provider. This collection can contain a maximum of 25 elements.
59+
*/
60+
@SerializedName(value = "customData", alternate = {"CustomData"})
61+
@Expose
62+
public java.util.List<KeyValue> customData;
63+
64+
/**
65+
* The Custom Key Value Data.
66+
* Custom data to define key/value pairs specific to a VPN provider. This collection can contain a maximum of 25 elements.
67+
*/
68+
@SerializedName(value = "customKeyValueData", alternate = {"CustomKeyValueData"})
69+
@Expose
70+
public java.util.List<KeyValuePair> customKeyValueData;
71+
5472
/**
5573
* The Microsoft Tunnel Site Id.
5674
* Microsoft Tunnel site ID.

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@ public class AndroidManagedAppProtection extends TargetedManagedAppProtection im
7878
@Expose
7979
public ManagedAppRemediationAction appActionIfAndroidSafetyNetDeviceAttestationFailed;
8080

81+
/**
82+
* The App Action If Device Lock Not Set.
83+
* Defines a managed app behavior, either warn, block or wipe, if the screen lock is required on android device but is not set.
84+
*/
85+
@SerializedName(value = "appActionIfDeviceLockNotSet", alternate = {"AppActionIfDeviceLockNotSet"})
86+
@Expose
87+
public ManagedAppRemediationAction appActionIfDeviceLockNotSet;
88+
8189
/**
8290
* The Approved Keyboards.
8391
* If Keyboard Restriction is enabled, only keyboards in this approved list will be allowed. A key should be Android package id for a keyboard and value should be a friendly name
@@ -94,6 +102,14 @@ public class AndroidManagedAppProtection extends TargetedManagedAppProtection im
94102
@Expose
95103
public Boolean biometricAuthenticationBlocked;
96104

105+
/**
106+
* The Block After Company Portal Update Deferral In Days.
107+
* Maximum number of days Company Portal update can be deferred on the device or app access will be blocked.
108+
*/
109+
@SerializedName(value = "blockAfterCompanyPortalUpdateDeferralInDays", alternate = {"BlockAfterCompanyPortalUpdateDeferralInDays"})
110+
@Expose
111+
public Integer blockAfterCompanyPortalUpdateDeferralInDays;
112+
97113
/**
98114
* The Custom Browser Display Name.
99115
* Friendly name of the preferred custom browser to open weblink on Android. When this property is configured, ManagedBrowserToOpenLinksRequired should be true.
@@ -134,6 +150,14 @@ public class AndroidManagedAppProtection extends TargetedManagedAppProtection im
134150
@Expose
135151
public Integer deployedAppCount;
136152

153+
/**
154+
* The Device Lock Required.
155+
* Defines if any kind of lock must be required on android device
156+
*/
157+
@SerializedName(value = "deviceLockRequired", alternate = {"DeviceLockRequired"})
158+
@Expose
159+
public Boolean deviceLockRequired;
160+
137161
/**
138162
* The Disable App Encryption If Device Encryption Is Enabled.
139163
* When this setting is enabled, app level encryption is disabled if device level encryption is enabled
@@ -246,6 +270,22 @@ public class AndroidManagedAppProtection extends TargetedManagedAppProtection im
246270
@Expose
247271
public Boolean screenCaptureBlocked;
248272

273+
/**
274+
* The Warn After Company Portal Update Deferral In Days.
275+
* Maximum number of days Company Portal update can be deferred on the device or the user will receive the warning
276+
*/
277+
@SerializedName(value = "warnAfterCompanyPortalUpdateDeferralInDays", alternate = {"WarnAfterCompanyPortalUpdateDeferralInDays"})
278+
@Expose
279+
public Integer warnAfterCompanyPortalUpdateDeferralInDays;
280+
281+
/**
282+
* The Wipe After Company Portal Update Deferral In Days.
283+
* Maximum number of days Company Portal update can be deferred on the device or the company data on the app will be wiped
284+
*/
285+
@SerializedName(value = "wipeAfterCompanyPortalUpdateDeferralInDays", alternate = {"WipeAfterCompanyPortalUpdateDeferralInDays"})
286+
@Expose
287+
public Integer wipeAfterCompanyPortalUpdateDeferralInDays;
288+
249289
/**
250290
* The Apps.
251291
* List of apps to which the policy is deployed.
Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
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.serializer.ISerializer;
7+
import com.microsoft.graph.serializer.IJsonBackedObject;
8+
import com.microsoft.graph.serializer.AdditionalDataManager;
9+
import java.util.EnumSet;
10+
import com.microsoft.graph.models.generated.CaseAction;
11+
import com.microsoft.graph.models.generated.CaseOperationStatus;
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 Case Index Operation.
23+
*/
24+
public class CaseIndexOperation extends Entity implements IJsonBackedObject {
25+
26+
27+
/**
28+
* The Action.
29+
*
30+
*/
31+
@SerializedName(value = "action", alternate = {"Action"})
32+
@Expose
33+
public CaseAction action;
34+
35+
/**
36+
* The Completed Date Time.
37+
*
38+
*/
39+
@SerializedName(value = "completedDateTime", alternate = {"CompletedDateTime"})
40+
@Expose
41+
public java.util.Calendar completedDateTime;
42+
43+
/**
44+
* The Created Date Time.
45+
*
46+
*/
47+
@SerializedName(value = "createdDateTime", alternate = {"CreatedDateTime"})
48+
@Expose
49+
public java.util.Calendar createdDateTime;
50+
51+
/**
52+
* The Display Name.
53+
*
54+
*/
55+
@SerializedName(value = "displayName", alternate = {"DisplayName"})
56+
@Expose
57+
public String displayName;
58+
59+
/**
60+
* The Percent Progress.
61+
*
62+
*/
63+
@SerializedName(value = "percentProgress", alternate = {"PercentProgress"})
64+
@Expose
65+
public Integer percentProgress;
66+
67+
/**
68+
* The Status.
69+
*
70+
*/
71+
@SerializedName(value = "status", alternate = {"Status"})
72+
@Expose
73+
public CaseOperationStatus status;
74+
75+
76+
/**
77+
* The raw representation of this class
78+
*/
79+
private JsonObject rawObject;
80+
81+
/**
82+
* The serializer
83+
*/
84+
private ISerializer serializer;
85+
86+
/**
87+
* Gets the raw representation of this class
88+
*
89+
* @return the raw representation of this class
90+
*/
91+
public JsonObject getRawObject() {
92+
return rawObject;
93+
}
94+
95+
/**
96+
* Gets serializer
97+
*
98+
* @return the serializer
99+
*/
100+
protected ISerializer getSerializer() {
101+
return serializer;
102+
}
103+
104+
/**
105+
* Sets the raw JSON object
106+
*
107+
* @param serializer the serializer
108+
* @param json the JSON object to set this object to
109+
*/
110+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
111+
this.serializer = serializer;
112+
rawObject = json;
113+
114+
}
115+
}

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

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

7070
/**
7171
* The Lifecycle Event.
72-
*
72+
* The type of lifecycle notification if the current notification is a lifecycle notification. Optional. Supported values are missed, removed, reauthorizationRequired.
7373
*/
7474
@SerializedName(value = "lifecycleEvent", alternate = {"LifecycleEvent"})
7575
@Expose

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
import com.microsoft.graph.models.extensions.TeamsAppInstallation;
1111
import com.microsoft.graph.models.extensions.ConversationMember;
1212
import com.microsoft.graph.models.extensions.ChatMessage;
13+
import com.microsoft.graph.models.extensions.TeamsTab;
1314
import com.microsoft.graph.models.extensions.Entity;
1415
import com.microsoft.graph.requests.extensions.TeamsAppInstallationCollectionPage;
1516
import com.microsoft.graph.requests.extensions.ConversationMemberCollectionPage;
1617
import com.microsoft.graph.requests.extensions.ChatMessageCollectionPage;
18+
import com.microsoft.graph.requests.extensions.TeamsTabCollectionPage;
1719

1820

1921
import com.google.gson.JsonObject;
@@ -76,6 +78,14 @@ public class Chat extends Entity implements IJsonBackedObject {
7678
@Expose
7779
public ChatMessageCollectionPage messages;
7880

81+
/**
82+
* The Tabs.
83+
*
84+
*/
85+
@SerializedName(value = "tabs", alternate = {"Tabs"})
86+
@Expose
87+
public TeamsTabCollectionPage tabs;
88+
7989

8090
/**
8191
* The raw representation of this class
@@ -127,5 +137,9 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
127137
if (json.has("messages")) {
128138
messages = serializer.deserializeObject(json.get("messages").toString(), ChatMessageCollectionPage.class);
129139
}
140+
141+
if (json.has("tabs")) {
142+
tabs = serializer.deserializeObject(json.get("tabs").toString(), TeamsTabCollectionPage.class);
143+
}
130144
}
131145
}
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
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.serializer.ISerializer;
7+
import com.microsoft.graph.serializer.IJsonBackedObject;
8+
import com.microsoft.graph.serializer.AdditionalDataManager;
9+
import java.util.EnumSet;
10+
11+
12+
import com.google.gson.JsonObject;
13+
import com.google.gson.annotations.SerializedName;
14+
import com.google.gson.annotations.Expose;
15+
16+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
17+
18+
/**
19+
* The class for the Conditional Access Client Applications.
20+
*/
21+
public class ConditionalAccessClientApplications implements IJsonBackedObject {
22+
23+
@SerializedName("@odata.type")
24+
@Expose
25+
public String oDataType;
26+
27+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
28+
29+
@Override
30+
public final AdditionalDataManager additionalDataManager() {
31+
return additionalDataManager;
32+
}
33+
34+
/**
35+
* The Exclude Service Principals.
36+
*
37+
*/
38+
@SerializedName(value = "excludeServicePrincipals", alternate = {"ExcludeServicePrincipals"})
39+
@Expose
40+
public java.util.List<String> excludeServicePrincipals;
41+
42+
/**
43+
* The Include Service Principals.
44+
*
45+
*/
46+
@SerializedName(value = "includeServicePrincipals", alternate = {"IncludeServicePrincipals"})
47+
@Expose
48+
public java.util.List<String> includeServicePrincipals;
49+
50+
51+
/**
52+
* The raw representation of this class
53+
*/
54+
private JsonObject rawObject;
55+
56+
/**
57+
* The serializer
58+
*/
59+
private ISerializer serializer;
60+
61+
/**
62+
* Gets the raw representation of this class
63+
*
64+
* @return the raw representation of this class
65+
*/
66+
public JsonObject getRawObject() {
67+
return rawObject;
68+
}
69+
70+
/**
71+
* Gets serializer
72+
*
73+
* @return the serializer
74+
*/
75+
protected ISerializer getSerializer() {
76+
return serializer;
77+
}
78+
79+
/**
80+
* Sets the raw JSON object
81+
*
82+
* @param serializer the serializer
83+
* @param json the JSON object to set this object to
84+
*/
85+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
86+
this.serializer = serializer;
87+
rawObject = json;
88+
89+
}
90+
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.microsoft.graph.serializer.AdditionalDataManager;
99
import java.util.EnumSet;
1010
import com.microsoft.graph.models.extensions.ConditionalAccessApplications;
11+
import com.microsoft.graph.models.extensions.ConditionalAccessClientApplications;
1112
import com.microsoft.graph.models.generated.ConditionalAccessClientApp;
1213
import com.microsoft.graph.models.extensions.ConditionalAccessDevices;
1314
import com.microsoft.graph.models.extensions.ConditionalAccessDeviceStates;
@@ -47,6 +48,14 @@ public final AdditionalDataManager additionalDataManager() {
4748
@Expose
4849
public ConditionalAccessApplications applications;
4950

51+
/**
52+
* The Client Applications.
53+
*
54+
*/
55+
@SerializedName(value = "clientApplications", alternate = {"ClientApplications"})
56+
@Expose
57+
public ConditionalAccessClientApplications clientApplications;
58+
5059
/**
5160
* The Client App Types.
5261
* Client application types included in the policy. Possible values are: all, browser, mobileAppsAndDesktopClients, exchangeActiveSync, easSupported, other.

0 commit comments

Comments
 (0)