Skip to content

Commit cb31e5b

Browse files
authored
Merge pull request #73 from microsoftgraph/beta/pipelinebuild/42274
Generated beta models and request builders using Typewriter
2 parents 055419d + 739aec9 commit cb31e5b

File tree

381 files changed

+37609
-9830
lines changed

Some content is hidden

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

381 files changed

+37609
-9830
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-beta:0.5.0-SNAPSHOT'
22+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.6.0-SNAPSHOT'
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-beta</artifactId>
34-
<version>0.5.0-SNAPSHOT</version>
34+
<version>0.6.0-SNAPSHOT</version>
3535
</dependency>
3636
```
3737

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

133133

134134

135+

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-beta
2828
mavenMajorVersion = 0
29-
mavenMinorVersion = 5
29+
mavenMinorVersion = 6
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -45,3 +45,4 @@ mavenCentralPublishingEnabled=false
4545

4646

4747

48+

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ 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 = "0.5.0";
33+
public static final String VERSION_NAME = "0.6.0";
3434
}
3535

3636

3737

3838

39+

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class AccessReviewScheduleDefinition extends Entity implements IJsonBacke
7979

8080
/**
8181
* The Instance Enumeration Scope.
82-
* In the case of an all groups review, this determines the scope of which groups will be reviewed. Each group will become a unique accessReviewInstance of the access review series. For supported scopes, see accessReviewScope.
82+
* In the case of a review of guest users across all Microsoft 365 groups, this determines the scope of which groups will be reviewed. Each group will become a unique accessReviewInstance of the access review series. For supported scopes, see accessReviewScope.
8383
*/
8484
@SerializedName(value = "instanceEnumerationScope", alternate = {"InstanceEnumerationScope"})
8585
@Expose
@@ -103,7 +103,7 @@ public class AccessReviewScheduleDefinition extends Entity implements IJsonBacke
103103

104104
/**
105105
* The Scope.
106-
* Defines scope of users reviewed in a group. For supported scopes, see accessReviewScope. Required on create.
106+
* Defines scope of users reviewed. For supported scopes, see accessReviewScope. Required on create.
107107
*/
108108
@SerializedName(value = "scope", alternate = {"Scope"})
109109
@Expose
Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,211 @@
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.AndroidDeviceOwnerRequiredPasswordType;
12+
import com.microsoft.graph.models.extensions.DeviceConfiguration;
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 Aosp Device Owner Device Configuration.
23+
*/
24+
public class AospDeviceOwnerDeviceConfiguration extends DeviceConfiguration implements IJsonBackedObject {
25+
26+
27+
/**
28+
* The Apps Allow Install From Unknown Sources.
29+
* Indicates whether or not the user is allowed to enable to unknown sources setting.
30+
*/
31+
@SerializedName(value = "appsAllowInstallFromUnknownSources", alternate = {"AppsAllowInstallFromUnknownSources"})
32+
@Expose
33+
public Boolean appsAllowInstallFromUnknownSources;
34+
35+
/**
36+
* The Backup Blocked.
37+
* Indicates whether or not to block backup service.
38+
*/
39+
@SerializedName(value = "backupBlocked", alternate = {"BackupBlocked"})
40+
@Expose
41+
public Boolean backupBlocked;
42+
43+
/**
44+
* The Bluetooth Block Configuration.
45+
* Indicates whether or not to block a user from configuring bluetooth.
46+
*/
47+
@SerializedName(value = "bluetoothBlockConfiguration", alternate = {"BluetoothBlockConfiguration"})
48+
@Expose
49+
public Boolean bluetoothBlockConfiguration;
50+
51+
/**
52+
* The Bluetooth Block Contact Sharing.
53+
* Indicates whether or not to block a user from sharing contacts via bluetooth.
54+
*/
55+
@SerializedName(value = "bluetoothBlockContactSharing", alternate = {"BluetoothBlockContactSharing"})
56+
@Expose
57+
public Boolean bluetoothBlockContactSharing;
58+
59+
/**
60+
* The Bluetooth Blocked.
61+
* Indicates whether or not to disable the use of bluetooth. When set to true, bluetooth cannot be enabled on the device.
62+
*/
63+
@SerializedName(value = "bluetoothBlocked", alternate = {"BluetoothBlocked"})
64+
@Expose
65+
public Boolean bluetoothBlocked;
66+
67+
/**
68+
* The Camera Blocked.
69+
* Indicates whether or not to disable the use of the camera.
70+
*/
71+
@SerializedName(value = "cameraBlocked", alternate = {"CameraBlocked"})
72+
@Expose
73+
public Boolean cameraBlocked;
74+
75+
/**
76+
* The Cellular Block Wi Fi Tethering.
77+
* Indicates whether or not to block Wi-Fi tethering.
78+
*/
79+
@SerializedName(value = "cellularBlockWiFiTethering", alternate = {"CellularBlockWiFiTethering"})
80+
@Expose
81+
public Boolean cellularBlockWiFiTethering;
82+
83+
/**
84+
* The Factory Reset Blocked.
85+
* Indicates whether or not the factory reset option in settings is disabled.
86+
*/
87+
@SerializedName(value = "factoryResetBlocked", alternate = {"FactoryResetBlocked"})
88+
@Expose
89+
public Boolean factoryResetBlocked;
90+
91+
/**
92+
* The Password Minimum Length.
93+
* Indicates the minimum length of the password required on the device. Valid values 4 to 16
94+
*/
95+
@SerializedName(value = "passwordMinimumLength", alternate = {"PasswordMinimumLength"})
96+
@Expose
97+
public Integer passwordMinimumLength;
98+
99+
/**
100+
* The Password Minutes Of Inactivity Before Screen Timeout.
101+
* Minutes of inactivity before the screen times out.
102+
*/
103+
@SerializedName(value = "passwordMinutesOfInactivityBeforeScreenTimeout", alternate = {"PasswordMinutesOfInactivityBeforeScreenTimeout"})
104+
@Expose
105+
public Integer passwordMinutesOfInactivityBeforeScreenTimeout;
106+
107+
/**
108+
* The Password Required Type.
109+
* Indicates the minimum password quality required on the device.
110+
*/
111+
@SerializedName(value = "passwordRequiredType", alternate = {"PasswordRequiredType"})
112+
@Expose
113+
public AndroidDeviceOwnerRequiredPasswordType passwordRequiredType;
114+
115+
/**
116+
* The Password Sign In Failure Count Before Factory Reset.
117+
* Indicates the number of times a user can enter an incorrect password before the device is wiped. Valid values 4 to 11
118+
*/
119+
@SerializedName(value = "passwordSignInFailureCountBeforeFactoryReset", alternate = {"PasswordSignInFailureCountBeforeFactoryReset"})
120+
@Expose
121+
public Integer passwordSignInFailureCountBeforeFactoryReset;
122+
123+
/**
124+
* The Screen Capture Blocked.
125+
* Indicates whether or not to disable the capability to take screenshots.
126+
*/
127+
@SerializedName(value = "screenCaptureBlocked", alternate = {"ScreenCaptureBlocked"})
128+
@Expose
129+
public Boolean screenCaptureBlocked;
130+
131+
/**
132+
* The Security Allow Debugging Features.
133+
* Indicates whether or not to block the user from enabling debugging features on the device.
134+
*/
135+
@SerializedName(value = "securityAllowDebuggingFeatures", alternate = {"SecurityAllowDebuggingFeatures"})
136+
@Expose
137+
public Boolean securityAllowDebuggingFeatures;
138+
139+
/**
140+
* The Storage Allow Usb.
141+
* Indicates whether or not to block USB storage.
142+
*/
143+
@SerializedName(value = "storageAllowUsb", alternate = {"StorageAllowUsb"})
144+
@Expose
145+
public Boolean storageAllowUsb;
146+
147+
/**
148+
* The Storage Block External Media.
149+
* Indicates whether or not to block external media.
150+
*/
151+
@SerializedName(value = "storageBlockExternalMedia", alternate = {"StorageBlockExternalMedia"})
152+
@Expose
153+
public Boolean storageBlockExternalMedia;
154+
155+
/**
156+
* The Storage Block Usb File Transfer.
157+
* Indicates whether or not to block USB file transfer.
158+
*/
159+
@SerializedName(value = "storageBlockUsbFileTransfer", alternate = {"StorageBlockUsbFileTransfer"})
160+
@Expose
161+
public Boolean storageBlockUsbFileTransfer;
162+
163+
/**
164+
* The Wifi Block Edit Configurations.
165+
* Indicates whether or not to block the user from editing the wifi connection settings.
166+
*/
167+
@SerializedName(value = "wifiBlockEditConfigurations", alternate = {"WifiBlockEditConfigurations"})
168+
@Expose
169+
public Boolean wifiBlockEditConfigurations;
170+
171+
172+
/**
173+
* The raw representation of this class
174+
*/
175+
private JsonObject rawObject;
176+
177+
/**
178+
* The serializer
179+
*/
180+
private ISerializer serializer;
181+
182+
/**
183+
* Gets the raw representation of this class
184+
*
185+
* @return the raw representation of this class
186+
*/
187+
public JsonObject getRawObject() {
188+
return rawObject;
189+
}
190+
191+
/**
192+
* Gets serializer
193+
*
194+
* @return the serializer
195+
*/
196+
protected ISerializer getSerializer() {
197+
return serializer;
198+
}
199+
200+
/**
201+
* Sets the raw JSON object
202+
*
203+
* @param serializer the serializer
204+
* @param json the JSON object to set this object to
205+
*/
206+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
207+
this.serializer = serializer;
208+
rawObject = json;
209+
210+
}
211+
}

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

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,12 @@ public class Approval extends Entity implements IJsonBackedObject {
2626

2727

2828
/**
29-
* The Completed Steps.
29+
* The Steps.
3030
*
3131
*/
32-
@SerializedName(value = "completedSteps", alternate = {"CompletedSteps"})
32+
@SerializedName(value = "steps", alternate = {"Steps"})
3333
@Expose
34-
public ApprovalStepCollectionPage completedSteps;
35-
36-
/**
37-
* The Pending Steps.
38-
*
39-
*/
40-
@SerializedName(value = "pendingSteps", alternate = {"PendingSteps"})
41-
@Expose
42-
public ApprovalStepCollectionPage pendingSteps;
34+
public ApprovalStepCollectionPage steps;
4335

4436

4537
/**
@@ -81,12 +73,8 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
8173
rawObject = json;
8274

8375

84-
if (json.has("completedSteps")) {
85-
completedSteps = serializer.deserializeObject(json.get("completedSteps").toString(), ApprovalStepCollectionPage.class);
86-
}
87-
88-
if (json.has("pendingSteps")) {
89-
pendingSteps = serializer.deserializeObject(json.get("pendingSteps").toString(), ApprovalStepCollectionPage.class);
76+
if (json.has("steps")) {
77+
steps = serializer.deserializeObject(json.get("steps").toString(), ApprovalStepCollectionPage.class);
9078
}
9179
}
9280
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.microsoft.graph.models.extensions.PasswordlessMicrosoftAuthenticatorAuthenticationMethod;
1717
import com.microsoft.graph.models.extensions.PasswordAuthenticationMethod;
1818
import com.microsoft.graph.models.extensions.PhoneAuthenticationMethod;
19+
import com.microsoft.graph.models.extensions.TemporaryAccessPassAuthenticationMethod;
1920
import com.microsoft.graph.models.extensions.WindowsHelloForBusinessAuthenticationMethod;
2021
import com.microsoft.graph.models.extensions.Entity;
2122
import com.microsoft.graph.requests.extensions.EmailAuthenticationMethodCollectionPage;
@@ -26,6 +27,7 @@
2627
import com.microsoft.graph.requests.extensions.PasswordlessMicrosoftAuthenticatorAuthenticationMethodCollectionPage;
2728
import com.microsoft.graph.requests.extensions.PasswordAuthenticationMethodCollectionPage;
2829
import com.microsoft.graph.requests.extensions.PhoneAuthenticationMethodCollectionPage;
30+
import com.microsoft.graph.requests.extensions.TemporaryAccessPassAuthenticationMethodCollectionPage;
2931
import com.microsoft.graph.requests.extensions.WindowsHelloForBusinessAuthenticationMethodCollectionPage;
3032

3133

@@ -105,6 +107,14 @@ public class Authentication extends Entity implements IJsonBackedObject {
105107
@Expose
106108
public PhoneAuthenticationMethodCollectionPage phoneMethods;
107109

110+
/**
111+
* The Temporary Access Pass Methods.
112+
*
113+
*/
114+
@SerializedName(value = "temporaryAccessPassMethods", alternate = {"TemporaryAccessPassMethods"})
115+
@Expose
116+
public TemporaryAccessPassAuthenticationMethodCollectionPage temporaryAccessPassMethods;
117+
108118
/**
109119
* The Windows Hello For Business Methods.
110120
*
@@ -185,6 +195,10 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
185195
phoneMethods = serializer.deserializeObject(json.get("phoneMethods").toString(), PhoneAuthenticationMethodCollectionPage.class);
186196
}
187197

198+
if (json.has("temporaryAccessPassMethods")) {
199+
temporaryAccessPassMethods = serializer.deserializeObject(json.get("temporaryAccessPassMethods").toString(), TemporaryAccessPassAuthenticationMethodCollectionPage.class);
200+
}
201+
188202
if (json.has("windowsHelloForBusinessMethods")) {
189203
windowsHelloForBusinessMethods = serializer.deserializeObject(json.get("windowsHelloForBusinessMethods").toString(), WindowsHelloForBusinessAuthenticationMethodCollectionPage.class);
190204
}

0 commit comments

Comments
 (0)