Skip to content

Commit e26125d

Browse files
Merge pull request #273 from microsoftgraph/beta/pipelinebuild/71731
Generated beta models and request builders using Typewriter
2 parents 160eb5a + 623d7c5 commit e26125d

File tree

124 files changed

+6439
-97
lines changed

Some content is hidden

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

124 files changed

+6439
-97
lines changed

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
## [0.44.0] - 2022-04-05
15+
16+
### Added
17+
18+
- AvailabilityItem model.
19+
- ExtractSensitivityLabelsResult model.
20+
- KioskModeType model.
21+
- WindowsWiredNetworkConfiguration model and related requests.
22+
- AospDeviceOwner models and related requests.
23+
- BookingsAvailabilityStatus models and related requests.
24+
- DeviceManagementConfigurationSecretSettingValue models.
25+
- DriveItemExtractSensitivityLabelsParameterSet models and related requests.
26+
- SensitivityLabelAssignment models.
27+
- TenantAttachRBAC models and related requests.
28+
- WindowsDriverUpdateProfileInventorySync models.
29+
- WiredNetworkAuthentication models.
30+
- ManagedDeviceCertificateState requests.
31+
- Windows81TrustedRootCertificateCollection requests.
32+
33+
### Changed
34+
35+
- Updated beta models and request builders generated using Typewriter, based on latest Beta-Metadata.
36+
- Updated referances to the added models and request builders in related classes, ex: AospDeviceOwnerCertificateProfileBase model, DeviceManagement model, DriveItemRequestBuilder request etc.
37+
1438
## [0.43.0] - 2022-03-29
1539

1640
### Added

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
2121
dependencies {
2222
// Include the sdk as a dependency
23-
implementation 'com.microsoft.graph:microsoft-graph-beta:0.43.0-SNAPSHOT'
23+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.44.0-SNAPSHOT'
2424
// Uncomment the line below if you are building an android application
2525
//implementation 'com.google.guava:guava:30.1.1-android'
2626
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
@@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
3737
<!-- Include the sdk as a dependency -->
3838
<groupId>com.microsoft.graph</groupId>
3939
<artifactId>microsoft-graph-beta</artifactId>
40-
<version>0.43.0-SNAPSHOT</version>
40+
<version>0.44.0-SNAPSHOT</version>
4141
</dependency>
4242
<dependency>
4343
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -181,5 +181,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
181181

182182

183183

184+
184185

185186

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 = 43
29+
mavenMinorVersion = 44
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -80,5 +80,6 @@ mavenCentralPublishingEnabled=false
8080

8181

8282

83+
8384

8485

src/main/java/com/microsoft/graph/ediscovery/models/CaseOperation.java

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

3232
/**
3333
* The Action.
34-
* The type of action the operation represents. Possible values are: addToReviewSet,applyTags,contentExport,convertToPdf,estimateStatistics
34+
* The type of action the operation represents. Possible values are: addToReviewSet,applyTags,contentExport,convertToPdf,estimateStatistics, purgeData
3535
*/
3636
@SerializedName(value = "action", alternate = {"Action"})
3737
@Expose

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private Constants() {
1818
/** The client secret to use for unit testing */
1919
public static final String CLIENTSECRET = "clientsecret";
2020
/** The SDK version */
21-
public static final String VERSION_NAME = "0.43.0";
21+
public static final String VERSION_NAME = "0.44.0";
2222
}
2323

2424

@@ -55,5 +55,6 @@ private Constants() {
5555

5656

5757

58+
5859

5960

src/main/java/com/microsoft/graph/models/AccessPackageAssignmentPolicy.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class AccessPackageAssignmentPolicy extends Entity implements IJsonBacked
7272

7373
/**
7474
* The Created Date Time.
75-
* 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 is 2014-01-01T00:00:00Z
75+
* 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 is 2014-01-01T00:00:00Z.
7676
*/
7777
@SerializedName(value = "createdDateTime", alternate = {"CreatedDateTime"})
7878
@Expose
@@ -90,7 +90,7 @@ public class AccessPackageAssignmentPolicy extends Entity implements IJsonBacked
9090

9191
/**
9292
* The Display Name.
93-
* The display name of the policy. Supports $filter (eq).
93+
* The display name of the policy.
9494
*/
9595
@SerializedName(value = "displayName", alternate = {"DisplayName"})
9696
@Expose
@@ -126,7 +126,7 @@ public class AccessPackageAssignmentPolicy extends Entity implements IJsonBacked
126126

127127
/**
128128
* The Modified Date Time.
129-
* 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 is 2014-01-01T00:00:00Z
129+
* 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 is 2014-01-01T00:00:00Z.
130130
*/
131131
@SerializedName(value = "modifiedDateTime", alternate = {"ModifiedDateTime"})
132132
@Expose
@@ -144,7 +144,7 @@ public class AccessPackageAssignmentPolicy extends Entity implements IJsonBacked
144144

145145
/**
146146
* The Request Approval Settings.
147-
* Who must approve requests for access package in this policy.
147+
* Specifies the settings for approval of requests for an access package assignment through this policy. For example, if approval is required for new requests.
148148
*/
149149
@SerializedName(value = "requestApprovalSettings", alternate = {"RequestApprovalSettings"})
150150
@Expose
@@ -153,7 +153,7 @@ public class AccessPackageAssignmentPolicy extends Entity implements IJsonBacked
153153

154154
/**
155155
* The Requestor Settings.
156-
* Who can request this access package from this policy.
156+
* Provides additional settings to select who can create a request for an access package assignment through this policy, and what they can include in their request.
157157
*/
158158
@SerializedName(value = "requestorSettings", alternate = {"RequestorSettings"})
159159
@Expose
@@ -162,7 +162,7 @@ public class AccessPackageAssignmentPolicy extends Entity implements IJsonBacked
162162

163163
/**
164164
* The Access Package.
165-
* The access package with this policy. Read-only. Nullable. Supports $expand.
165+
* Access package containing this policy. Read-only.
166166
*/
167167
@SerializedName(value = "accessPackage", alternate = {"AccessPackage"})
168168
@Expose

src/main/java/com/microsoft/graph/models/AndroidDeviceOwnerGeneralDeviceConfiguration.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.microsoft.graph.models.AndroidDeviceOwnerKioskModeManagedFolder;
2424
import com.microsoft.graph.models.KioskModeManagedHomeScreenPinComplexity;
2525
import com.microsoft.graph.models.AndroidDeviceOwnerKioskModeScreenOrientation;
26+
import com.microsoft.graph.models.KioskModeType;
2627
import com.microsoft.graph.models.AndroidDeviceOwnerVirtualHomeButtonType;
2728
import com.microsoft.graph.models.MicrosoftLauncherDockPresence;
2829
import com.microsoft.graph.models.MicrosoftLauncherSearchBarPlacement;
@@ -581,6 +582,15 @@ public class AndroidDeviceOwnerGeneralDeviceConfiguration extends DeviceConfigur
581582
@Nullable
582583
public Boolean kioskModeShowDeviceInfo;
583584

585+
/**
586+
* The Kiosk Mode Use Managed Home Screen App.
587+
* Whether or not to use single app kiosk mode or multi-app kiosk mode. Possible values are: notConfigured, singleAppMode, multiAppMode.
588+
*/
589+
@SerializedName(value = "kioskModeUseManagedHomeScreenApp", alternate = {"KioskModeUseManagedHomeScreenApp"})
590+
@Expose
591+
@Nullable
592+
public KioskModeType kioskModeUseManagedHomeScreenApp;
593+
584594
/**
585595
* The Kiosk Mode Virtual Home Button Enabled.
586596
* Whether or not to display a virtual home button when the device is in Kiosk Mode.

src/main/java/com/microsoft/graph/models/AospDeviceOwnerCertificateProfileBase.java

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
import com.microsoft.graph.serializer.IJsonBackedObject;
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
11+
import com.microsoft.graph.http.BaseCollectionPage;
12+
import com.microsoft.graph.models.CertificateValidityPeriodScale;
13+
import com.microsoft.graph.models.ExtendedKeyUsage;
14+
import com.microsoft.graph.models.SubjectAlternativeNameType;
15+
import com.microsoft.graph.models.SubjectNameFormat;
16+
import com.microsoft.graph.models.AospDeviceOwnerTrustedRootCertificate;
1117
import com.microsoft.graph.models.DeviceConfiguration;
1218

1319

@@ -25,6 +31,69 @@
2531
public class AospDeviceOwnerCertificateProfileBase extends DeviceConfiguration implements IJsonBackedObject {
2632

2733

34+
/**
35+
* The Certificate Validity Period Scale.
36+
* Scale for the Certificate Validity Period. Possible values are: days, months, years.
37+
*/
38+
@SerializedName(value = "certificateValidityPeriodScale", alternate = {"CertificateValidityPeriodScale"})
39+
@Expose
40+
@Nullable
41+
public CertificateValidityPeriodScale certificateValidityPeriodScale;
42+
43+
/**
44+
* The Certificate Validity Period Value.
45+
* Value for the Certificate Validity Period.
46+
*/
47+
@SerializedName(value = "certificateValidityPeriodValue", alternate = {"CertificateValidityPeriodValue"})
48+
@Expose
49+
@Nullable
50+
public Integer certificateValidityPeriodValue;
51+
52+
/**
53+
* The Extended Key Usages.
54+
* Extended Key Usage (EKU) settings. This collection can contain a maximum of 500 elements.
55+
*/
56+
@SerializedName(value = "extendedKeyUsages", alternate = {"ExtendedKeyUsages"})
57+
@Expose
58+
@Nullable
59+
public java.util.List<ExtendedKeyUsage> extendedKeyUsages;
60+
61+
/**
62+
* The Renewal Threshold Percentage.
63+
* Certificate renewal threshold percentage. Valid values 1 to 99
64+
*/
65+
@SerializedName(value = "renewalThresholdPercentage", alternate = {"RenewalThresholdPercentage"})
66+
@Expose
67+
@Nullable
68+
public Integer renewalThresholdPercentage;
69+
70+
/**
71+
* The Subject Alternative Name Type.
72+
* Certificate Subject Alternative Name Type. This collection can contain a maximum of 500 elements. Possible values are: none, emailAddress, userPrincipalName, customAzureADAttribute, domainNameService, universalResourceIdentifier.
73+
*/
74+
@SerializedName(value = "subjectAlternativeNameType", alternate = {"SubjectAlternativeNameType"})
75+
@Expose
76+
@Nullable
77+
public EnumSet<SubjectAlternativeNameType> subjectAlternativeNameType;
78+
79+
/**
80+
* The Subject Name Format.
81+
* Certificate Subject Name Format. This collection can contain a maximum of 500 elements. Possible values are: commonName, commonNameIncludingEmail, commonNameAsEmail, custom, commonNameAsIMEI, commonNameAsSerialNumber, commonNameAsAadDeviceId, commonNameAsIntuneDeviceId, commonNameAsDurableDeviceId.
82+
*/
83+
@SerializedName(value = "subjectNameFormat", alternate = {"SubjectNameFormat"})
84+
@Expose
85+
@Nullable
86+
public SubjectNameFormat subjectNameFormat;
87+
88+
/**
89+
* The Root Certificate.
90+
* Trusted Root Certificate.
91+
*/
92+
@SerializedName(value = "rootCertificate", alternate = {"RootCertificate"})
93+
@Expose
94+
@Nullable
95+
public AospDeviceOwnerTrustedRootCertificate rootCertificate;
96+
2897

2998
/**
3099
* Sets the raw JSON object
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
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.WiFiAuthenticationMethod;
12+
import com.microsoft.graph.models.AndroidEapType;
13+
import com.microsoft.graph.models.NonEapAuthenticationMethodForEapTtlsType;
14+
import com.microsoft.graph.models.NonEapAuthenticationMethodForPeap;
15+
import com.microsoft.graph.models.AospDeviceOwnerCertificateProfileBase;
16+
import com.microsoft.graph.models.AospDeviceOwnerTrustedRootCertificate;
17+
import com.microsoft.graph.models.AospDeviceOwnerWiFiConfiguration;
18+
19+
20+
import com.google.gson.JsonObject;
21+
import com.google.gson.annotations.SerializedName;
22+
import com.google.gson.annotations.Expose;
23+
import javax.annotation.Nullable;
24+
import javax.annotation.Nonnull;
25+
26+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
27+
28+
/**
29+
* The class for the Aosp Device Owner Enterprise Wi Fi Configuration.
30+
*/
31+
public class AospDeviceOwnerEnterpriseWiFiConfiguration extends AospDeviceOwnerWiFiConfiguration implements IJsonBackedObject {
32+
33+
34+
/**
35+
* The Authentication Method.
36+
* Indicates the Authentication Method the client (device) needs to use when the EAP Type is configured to PEAP or EAP-TTLS. Possible values are: certificate, usernameAndPassword, derivedCredential.
37+
*/
38+
@SerializedName(value = "authenticationMethod", alternate = {"AuthenticationMethod"})
39+
@Expose
40+
@Nullable
41+
public WiFiAuthenticationMethod authenticationMethod;
42+
43+
/**
44+
* The Eap Type.
45+
* Indicates the type of EAP protocol set on the Wi-Fi endpoint (router). Possible values are: eapTls, eapTtls, peap.
46+
*/
47+
@SerializedName(value = "eapType", alternate = {"EapType"})
48+
@Expose
49+
@Nullable
50+
public AndroidEapType eapType;
51+
52+
/**
53+
* The Inner Authentication Protocol For Eap Ttls.
54+
* Non-EAP Method for Authentication (Inner Identity) when EAP Type is EAP-TTLS and Authenticationmethod is Username and Password. Possible values are: unencryptedPassword, challengeHandshakeAuthenticationProtocol, microsoftChap, microsoftChapVersionTwo.
55+
*/
56+
@SerializedName(value = "innerAuthenticationProtocolForEapTtls", alternate = {"InnerAuthenticationProtocolForEapTtls"})
57+
@Expose
58+
@Nullable
59+
public NonEapAuthenticationMethodForEapTtlsType innerAuthenticationProtocolForEapTtls;
60+
61+
/**
62+
* The Inner Authentication Protocol For Peap.
63+
* Non-EAP Method for Authentication (Inner Identity) when EAP Type is PEAP and Authenticationmethod is Username and Password. This collection can contain a maximum of 500 elements. Possible values are: none, microsoftChapVersionTwo.
64+
*/
65+
@SerializedName(value = "innerAuthenticationProtocolForPeap", alternate = {"InnerAuthenticationProtocolForPeap"})
66+
@Expose
67+
@Nullable
68+
public NonEapAuthenticationMethodForPeap innerAuthenticationProtocolForPeap;
69+
70+
/**
71+
* The Outer Identity Privacy Temporary Value.
72+
* Enable identity privacy (Outer Identity) when EAP Type is configured to EAP-TTLS or PEAP. The String provided here is used to mask the username of individual users when they attempt to connect to Wi-Fi network.
73+
*/
74+
@SerializedName(value = "outerIdentityPrivacyTemporaryValue", alternate = {"OuterIdentityPrivacyTemporaryValue"})
75+
@Expose
76+
@Nullable
77+
public String outerIdentityPrivacyTemporaryValue;
78+
79+
/**
80+
* The Identity Certificate For Client Authentication.
81+
* Identity Certificate for client authentication when EAP Type is configured to EAP-TLS, EAP-TTLS (with Certificate Authentication), or PEAP (with Certificate Authentication). This is the certificate presented by client to the Wi-Fi endpoint. The authentication server sitting behind the Wi-Fi endpoint must accept this certificate to successfully establish a Wi-Fi connection.
82+
*/
83+
@SerializedName(value = "identityCertificateForClientAuthentication", alternate = {"IdentityCertificateForClientAuthentication"})
84+
@Expose
85+
@Nullable
86+
public AospDeviceOwnerCertificateProfileBase identityCertificateForClientAuthentication;
87+
88+
/**
89+
* The Root Certificate For Server Validation.
90+
* Trusted Root Certificate for Server Validation when EAP Type is configured to EAP-TLS, EAP-TTLS or PEAP. This is the certificate presented by the Wi-Fi endpoint when the device attempts to connect to Wi-Fi endpoint. The device (or user) must accept this certificate to continue the connection attempt.
91+
*/
92+
@SerializedName(value = "rootCertificateForServerValidation", alternate = {"RootCertificateForServerValidation"})
93+
@Expose
94+
@Nullable
95+
public AospDeviceOwnerTrustedRootCertificate rootCertificateForServerValidation;
96+
97+
98+
/**
99+
* Sets the raw JSON object
100+
*
101+
* @param serializer the serializer
102+
* @param json the JSON object to set this object to
103+
*/
104+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
105+
106+
}
107+
}

0 commit comments

Comments
 (0)