Skip to content

Commit f68628f

Browse files
Merge pull request #1118 from microsoftgraph/v1.0/pipelinebuild/80520
Generated v1.0 models and request builders using Typewriter
2 parents 414067c + 676fbcd commit f68628f

File tree

72 files changed

+3216
-28
lines changed

Some content is hidden

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

72 files changed

+3216
-28
lines changed

CHANGELOG.md

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

1212
### Changed
1313

14+
## [5.31.0] - 2022-07-21
15+
16+
### Added
17+
18+
- AccessPackageAutomaticRequestSettings model.
19+
- AttributeRuleMembers model.
20+
- AuthenticationMethodSignInState model.
21+
- AuthenticationPhoneType model.
22+
- AvailabilityItem model.
23+
- BookingsAvailabilityStatus model.
24+
- StaffAvailabilityItem model.
25+
- BookingBusinessGetStaffAvailability models and related requests.
26+
- EmailAuthenticationMethod model and related requests.
27+
- PhoneAuthenticationMethod models and related requests.
28+
- SoftwareOathAuthenticationMethod model and related requests.
29+
30+
### Changed
31+
32+
- Generated v1.0 models and request builders using Typewriter.
33+
- References to newly added models/requests added to current models/requests.
34+
- Example: Authentication model now has refrences to EmailAuthenticationMethod, PhoneAuthenticationMethod, SoftwareOathAuthenticationMethod models.
35+
- Example: AuthenticationRequestBuilder now references EmailAuthenticationMethodRequestBuilder, PhoneAuthenticationMethodRequestBuilder, and SoftwareOathAuthenticationMethodRequestBuilder.
36+
1437
## [5.30.0] - 2022-07-05
1538

1639
### Added

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:5.30.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.31.0'
2323
// Uncomment the line below if you are building an android application
2424
//implementation 'com.google.guava:guava:30.1.1-android'
2525
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
@@ -36,7 +36,7 @@ Add the dependency in `dependencies` in pom.xml
3636
<!-- Include the sdk as a dependency -->
3737
<groupId>com.microsoft.graph</groupId>
3838
<artifactId>microsoft-graph</artifactId>
39-
<version>5.30.0</version>
39+
<version>5.31.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -161,5 +161,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
161161

162162

163163

164+
164165

165166

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

@@ -84,5 +84,6 @@ mavenCentralPublishingEnabled=false
8484

8585

8686

87+
8788

8889

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 = "5.30.0";
21+
public static final String VERSION_NAME = "5.31.0";
2222
}
2323

2424

@@ -61,5 +61,6 @@ private Constants() {
6161

6262

6363

64+
6465

6566

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.http.BaseCollectionPage;
1212
import com.microsoft.graph.models.AllowedTargetScope;
13+
import com.microsoft.graph.models.AccessPackageAutomaticRequestSettings;
1314
import com.microsoft.graph.models.ExpirationPattern;
1415
import com.microsoft.graph.models.AccessPackageAssignmentApprovalSettings;
1516
import com.microsoft.graph.models.AccessPackageAssignmentRequestorSettings;
@@ -43,6 +44,15 @@ public class AccessPackageAssignmentPolicy extends Entity implements IJsonBacked
4344
@Nullable
4445
public AllowedTargetScope allowedTargetScope;
4546

47+
/**
48+
* The Automatic Request Settings.
49+
*
50+
*/
51+
@SerializedName(value = "automaticRequestSettings", alternate = {"AutomaticRequestSettings"})
52+
@Expose
53+
@Nullable
54+
public AccessPackageAutomaticRequestSettings automaticRequestSettings;
55+
4656
/**
4757
* The Created Date Time.
4858
* 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
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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+
12+
13+
import com.google.gson.JsonObject;
14+
import com.google.gson.annotations.SerializedName;
15+
import com.google.gson.annotations.Expose;
16+
import javax.annotation.Nullable;
17+
import javax.annotation.Nonnull;
18+
19+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
20+
21+
/**
22+
* The class for the Access Package Automatic Request Settings.
23+
*/
24+
public class AccessPackageAutomaticRequestSettings implements IJsonBackedObject {
25+
26+
/** the OData type of the object as returned by the service */
27+
@SerializedName("@odata.type")
28+
@Expose
29+
@Nullable
30+
public String oDataType;
31+
32+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
33+
34+
@Override
35+
@Nonnull
36+
public final AdditionalDataManager additionalDataManager() {
37+
return additionalDataManager;
38+
}
39+
40+
/**
41+
* The Grace Period Before Access Removal.
42+
*
43+
*/
44+
@SerializedName(value = "gracePeriodBeforeAccessRemoval", alternate = {"GracePeriodBeforeAccessRemoval"})
45+
@Expose
46+
@Nullable
47+
public javax.xml.datatype.Duration gracePeriodBeforeAccessRemoval;
48+
49+
/**
50+
* The Remove Access When Target Leaves Allowed Targets.
51+
*
52+
*/
53+
@SerializedName(value = "removeAccessWhenTargetLeavesAllowedTargets", alternate = {"RemoveAccessWhenTargetLeavesAllowedTargets"})
54+
@Expose
55+
@Nullable
56+
public Boolean removeAccessWhenTargetLeavesAllowedTargets;
57+
58+
/**
59+
* The Request Access For Allowed Targets.
60+
*
61+
*/
62+
@SerializedName(value = "requestAccessForAllowedTargets", alternate = {"RequestAccessForAllowedTargets"})
63+
@Expose
64+
@Nullable
65+
public Boolean requestAccessForAllowedTargets;
66+
67+
68+
/**
69+
* Sets the raw JSON object
70+
*
71+
* @param serializer the serializer
72+
* @param json the JSON object to set this object to
73+
*/
74+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
75+
76+
}
77+
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,15 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
267267
@Nullable
268268
public java.util.List<RequiredResourceAccess> requiredResourceAccess;
269269

270+
/**
271+
* The Saml Metadata Url.
272+
* The URL where the service exposes SAML metadata for federation. This property is valid only for single-tenant applications. Nullable.
273+
*/
274+
@SerializedName(value = "samlMetadataUrl", alternate = {"SamlMetadataUrl"})
275+
@Expose
276+
@Nullable
277+
public String samlMetadataUrl;
278+
270279
/**
271280
* The Service Management Reference.
272281
* References application or service contact information from a Service or Asset Management database. Nullable.
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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.SubjectSet;
12+
13+
14+
import com.google.gson.JsonObject;
15+
import com.google.gson.annotations.SerializedName;
16+
import com.google.gson.annotations.Expose;
17+
import javax.annotation.Nullable;
18+
import javax.annotation.Nonnull;
19+
20+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
21+
22+
/**
23+
* The class for the Attribute Rule Members.
24+
*/
25+
public class AttributeRuleMembers extends SubjectSet implements IJsonBackedObject {
26+
27+
28+
/**
29+
* The Description.
30+
*
31+
*/
32+
@SerializedName(value = "description", alternate = {"Description"})
33+
@Expose
34+
@Nullable
35+
public String description;
36+
37+
/**
38+
* The Membership Rule.
39+
*
40+
*/
41+
@SerializedName(value = "membershipRule", alternate = {"MembershipRule"})
42+
@Expose
43+
@Nullable
44+
public String membershipRule;
45+
46+
47+
/**
48+
* Sets the raw JSON object
49+
*
50+
* @param serializer the serializer
51+
* @param json the JSON object to set this object to
52+
*/
53+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
54+
55+
}
56+
}

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,25 @@
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.http.BaseCollectionPage;
12+
import com.microsoft.graph.models.EmailAuthenticationMethod;
1213
import com.microsoft.graph.models.Fido2AuthenticationMethod;
1314
import com.microsoft.graph.models.AuthenticationMethod;
1415
import com.microsoft.graph.models.MicrosoftAuthenticatorAuthenticationMethod;
1516
import com.microsoft.graph.models.LongRunningOperation;
1617
import com.microsoft.graph.models.PasswordAuthenticationMethod;
18+
import com.microsoft.graph.models.PhoneAuthenticationMethod;
19+
import com.microsoft.graph.models.SoftwareOathAuthenticationMethod;
1720
import com.microsoft.graph.models.TemporaryAccessPassAuthenticationMethod;
1821
import com.microsoft.graph.models.WindowsHelloForBusinessAuthenticationMethod;
1922
import com.microsoft.graph.models.Entity;
23+
import com.microsoft.graph.requests.EmailAuthenticationMethodCollectionPage;
2024
import com.microsoft.graph.requests.Fido2AuthenticationMethodCollectionPage;
2125
import com.microsoft.graph.requests.AuthenticationMethodCollectionPage;
2226
import com.microsoft.graph.requests.MicrosoftAuthenticatorAuthenticationMethodCollectionPage;
2327
import com.microsoft.graph.requests.LongRunningOperationCollectionPage;
2428
import com.microsoft.graph.requests.PasswordAuthenticationMethodCollectionPage;
29+
import com.microsoft.graph.requests.PhoneAuthenticationMethodCollectionPage;
30+
import com.microsoft.graph.requests.SoftwareOathAuthenticationMethodCollectionPage;
2531
import com.microsoft.graph.requests.TemporaryAccessPassAuthenticationMethodCollectionPage;
2632
import com.microsoft.graph.requests.WindowsHelloForBusinessAuthenticationMethodCollectionPage;
2733

@@ -40,6 +46,15 @@
4046
public class Authentication extends Entity implements IJsonBackedObject {
4147

4248

49+
/**
50+
* The Email Methods.
51+
* Represents the email addresses registered to a user for authentication.
52+
*/
53+
@SerializedName(value = "emailMethods", alternate = {"EmailMethods"})
54+
@Expose
55+
@Nullable
56+
public EmailAuthenticationMethodCollectionPage emailMethods;
57+
4358
/**
4459
* The Fido2Methods.
4560
* Represents the FIDO2 security keys registered to a user for authentication.
@@ -85,6 +100,24 @@ public class Authentication extends Entity implements IJsonBackedObject {
85100
@Nullable
86101
public PasswordAuthenticationMethodCollectionPage passwordMethods;
87102

103+
/**
104+
* The Phone Methods.
105+
* Represents the phone registered to a user for authentication.
106+
*/
107+
@SerializedName(value = "phoneMethods", alternate = {"PhoneMethods"})
108+
@Expose
109+
@Nullable
110+
public PhoneAuthenticationMethodCollectionPage phoneMethods;
111+
112+
/**
113+
* The Software Oath Methods.
114+
*
115+
*/
116+
@SerializedName(value = "softwareOathMethods", alternate = {"SoftwareOathMethods"})
117+
@Expose
118+
@Nullable
119+
public SoftwareOathAuthenticationMethodCollectionPage softwareOathMethods;
120+
88121
/**
89122
* The Temporary Access Pass Methods.
90123
* Represents a Temporary Access Pass registered to a user for authentication through time-limited passcodes.
@@ -113,6 +146,10 @@ public class Authentication extends Entity implements IJsonBackedObject {
113146
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
114147

115148

149+
if (json.has("emailMethods")) {
150+
emailMethods = serializer.deserializeObject(json.get("emailMethods"), EmailAuthenticationMethodCollectionPage.class);
151+
}
152+
116153
if (json.has("fido2Methods")) {
117154
fido2Methods = serializer.deserializeObject(json.get("fido2Methods"), Fido2AuthenticationMethodCollectionPage.class);
118155
}
@@ -133,6 +170,14 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
133170
passwordMethods = serializer.deserializeObject(json.get("passwordMethods"), PasswordAuthenticationMethodCollectionPage.class);
134171
}
135172

173+
if (json.has("phoneMethods")) {
174+
phoneMethods = serializer.deserializeObject(json.get("phoneMethods"), PhoneAuthenticationMethodCollectionPage.class);
175+
}
176+
177+
if (json.has("softwareOathMethods")) {
178+
softwareOathMethods = serializer.deserializeObject(json.get("softwareOathMethods"), SoftwareOathAuthenticationMethodCollectionPage.class);
179+
}
180+
136181
if (json.has("temporaryAccessPassMethods")) {
137182
temporaryAccessPassMethods = serializer.deserializeObject(json.get("temporaryAccessPassMethods"), TemporaryAccessPassAuthenticationMethodCollectionPage.class);
138183
}

0 commit comments

Comments
 (0)