Skip to content

Commit c603503

Browse files
Merge pull request #1541 from microsoftgraph/v1.0/pipelinebuild/123864
Generated models and request builders
2 parents e856374 + fb78a10 commit c603503

40 files changed

+1481
-17
lines changed

CHANGELOG.md

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

1212
### Changed
1313

14+
## [5.69.0] - 2023-09-01
15+
16+
### Added
17+
18+
- Action models.
19+
- GroupRetryServiceProvisioning derived types and requests.
20+
- OrgContactRetryServiceProvisioning derived types and requests.
21+
- ServicePrincipalLockConfiguration model.
22+
- ServiceProvisioningError model.
23+
- ServiceProvisioningXmlError model.
24+
- UserRetryServiceProvisioning derived types and requests.
25+
1426
## [5.68.0] - 2023-08-18
1527

1628
### 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:5.68.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.69.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.68.0</version>
39+
<version>5.69.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
@@ -199,5 +199,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
199199

200200

201201

202+
202203

203204

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

@@ -122,5 +122,6 @@ mavenCentralPublishingEnabled=false
122122

123123

124124

125+
125126

126127

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

2424

@@ -99,5 +99,6 @@ private Constants() {
9999

100100

101101

102+
102103

103104

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.microsoft.graph.models.PublicClientApplication;
2222
import com.microsoft.graph.models.RequestSignatureVerification;
2323
import com.microsoft.graph.models.RequiredResourceAccess;
24+
import com.microsoft.graph.models.ServicePrincipalLockConfiguration;
2425
import com.microsoft.graph.models.SpaApplication;
2526
import com.microsoft.graph.models.VerifiedPublisher;
2627
import com.microsoft.graph.models.WebApplication;
@@ -300,6 +301,15 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
300301
@Nullable
301302
public String serviceManagementReference;
302303

304+
/**
305+
* The Service Principal Lock Configuration.
306+
* Specifies whether sensitive properties of a multi-tenant application should be locked for editing after the application is provisioned in a tenant. Nullable. null by default.
307+
*/
308+
@SerializedName(value = "servicePrincipalLockConfiguration", alternate = {"ServicePrincipalLockConfiguration"})
309+
@Expose
310+
@Nullable
311+
public ServicePrincipalLockConfiguration servicePrincipalLockConfiguration;
312+
303313
/**
304314
* The Sign In Audience.
305315
* Specifies the Microsoft accounts that are supported for the current application. The possible values are: AzureADMyOrg, AzureADMultipleOrgs, AzureADandPersonalMicrosoftAccount (default), and PersonalMicrosoftAccount. See more in the table. The value of this object also limits the number of permissions an app can request. For more information, see Limits on requested permissions per app. The value for this property has implications on other app object properties. As a result, if you change this property, you may need to change other properties first. For more information, see Validation differences for signInAudience.Supports $filter (eq, ne, not).

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class BaseItem extends Entity implements IJsonBackedObject {
3030

3131
/**
3232
* The Created By.
33-
* Identity of the user, device, or application which created the item. Read-only.
33+
* Identity of the user, device, or application that created the item. Read-only.
3434
*/
3535
@SerializedName(value = "createdBy", alternate = {"CreatedBy"})
3636
@Expose
@@ -66,7 +66,7 @@ public class BaseItem extends Entity implements IJsonBackedObject {
6666

6767
/**
6868
* The Last Modified By.
69-
* Identity of the user, device, and application which last modified the item. Read-only.
69+
* Identity of the user, device, and application that last modified the item. Read-only.
7070
*/
7171
@SerializedName(value = "lastModifiedBy", alternate = {"LastModifiedBy"})
7272
@Expose
@@ -102,7 +102,7 @@ public class BaseItem extends Entity implements IJsonBackedObject {
102102

103103
/**
104104
* The Web Url.
105-
* URL that displays the resource in the browser. Read-only.
105+
* URL that either displays the resource in the browser (for Office file formats), or is a direct link to the file (for other formats). Read-only.
106106
*/
107107
@SerializedName(value = "webUrl", alternate = {"WebUrl"})
108108
@Expose

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

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

147147
/**
148148
* The Permission Grants.
149-
*
149+
* A collection of permissions granted to apps for the chat.
150150
*/
151151
@SerializedName(value = "permissionGrants", alternate = {"PermissionGrants"})
152152
@Expose
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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.http.BaseCollectionPage;
12+
import com.microsoft.graph.models.IdentitySet;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.annotations.SerializedName;
17+
import com.google.gson.annotations.Expose;
18+
import javax.annotation.Nullable;
19+
import javax.annotation.Nonnull;
20+
21+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
22+
23+
/**
24+
* The class for the Comment Action.
25+
*/
26+
public class CommentAction implements IJsonBackedObject {
27+
28+
/** the OData type of the object as returned by the service */
29+
@SerializedName("@odata.type")
30+
@Expose
31+
@Nullable
32+
public String oDataType;
33+
34+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
35+
36+
@Override
37+
@Nonnull
38+
public final AdditionalDataManager additionalDataManager() {
39+
return additionalDataManager;
40+
}
41+
42+
/**
43+
* The Is Reply.
44+
* If true, this activity was a reply to an existing comment thread.
45+
*/
46+
@SerializedName(value = "isReply", alternate = {"IsReply"})
47+
@Expose
48+
@Nullable
49+
public Boolean isReply;
50+
51+
/**
52+
* The Parent Author.
53+
* The identity of the user who started the comment thread.
54+
*/
55+
@SerializedName(value = "parentAuthor", alternate = {"ParentAuthor"})
56+
@Expose
57+
@Nullable
58+
public IdentitySet parentAuthor;
59+
60+
/**
61+
* The Participants.
62+
* The identities of the users participating in this comment thread.
63+
*/
64+
@SerializedName(value = "participants", alternate = {"Participants"})
65+
@Expose
66+
@Nullable
67+
public java.util.List<IdentitySet> participants;
68+
69+
70+
/**
71+
* Sets the raw JSON object
72+
*
73+
* @param serializer the serializer
74+
* @param json the JSON object to set this object to
75+
*/
76+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
77+
78+
}
79+
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,15 @@ public class ConditionalAccessPolicy extends Entity implements IJsonBackedObject
101101
@Nullable
102102
public ConditionalAccessPolicyState state;
103103

104+
/**
105+
* The Template Id.
106+
*
107+
*/
108+
@SerializedName(value = "templateId", alternate = {"TemplateId"})
109+
@Expose
110+
@Nullable
111+
public String templateId;
112+
104113

105114
/**
106115
* Sets the raw JSON object
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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 Create Action.
23+
*/
24+
public class CreateAction 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+
/**
42+
* Sets the raw JSON object
43+
*
44+
* @param serializer the serializer
45+
* @param json the JSON object to set this object to
46+
*/
47+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
48+
49+
}
50+
}

0 commit comments

Comments
 (0)