Skip to content

Commit 873875e

Browse files
authored
Merge pull request #1187 from microsoftgraph/v1.0/pipelinebuild/86465
Generated v1.0 models and request builders using Typewriter
2 parents b43b34d + 58f03b7 commit 873875e

25 files changed

+1243
-8
lines changed

CHANGELOG.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14-
## [5.35.0] - 2022-09-015
14+
## [5.36.0] - 2022-09-22
15+
16+
### Added
17+
18+
- MessagePinnedEventMessageDetail model.
19+
- MessageUnpinnedEventMessageDetail model.
20+
- RedirectUriSettings model.
21+
- X509Certificate models.
22+
- ContentSharingSession model and related requests.
23+
- PinnedChatMessageInfo model and related requests.
24+
- X509CertificateAuthentication models and related requests.
25+
- ChatMessageReference requests.
26+
- ChatMessageWithReference requests.
27+
28+
### Changed
29+
30+
- Generated v1.0 models and request builders using Typewriter.
31+
- Classes related to the removed and added models/requests have been updated to reflect the addition and removal of these models/requests.
32+
- Removed RestrictedSignIn models and related requests.
33+
34+
## [5.35.0] - 2022-09-15
1535

1636
### Added
1737

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.35.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.36.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.35.0</version>
39+
<version>5.36.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -166,5 +166,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
166166

167167

168168

169+
169170

170171

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

@@ -89,5 +89,6 @@ mavenCentralPublishingEnabled=false
8989

9090

9191

92+
9293

9394

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

2424

@@ -66,5 +66,6 @@ private Constants() {
6666

6767

6868

69+
6970

7071

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.microsoft.graph.models.CallTranscriptionInfo;
2727
import com.microsoft.graph.models.Entity;
2828
import com.microsoft.graph.requests.AudioRoutingGroupCollectionPage;
29+
import com.microsoft.graph.requests.ContentSharingSessionCollectionPage;
2930
import com.microsoft.graph.requests.CommsOperationCollectionPage;
3031
import com.microsoft.graph.requests.ParticipantCollectionPage;
3132

@@ -233,6 +234,15 @@ public class Call extends Entity implements IJsonBackedObject {
233234
@Nullable
234235
public com.microsoft.graph.requests.AudioRoutingGroupCollectionPage audioRoutingGroups;
235236

237+
/**
238+
* The Content Sharing Sessions.
239+
*
240+
*/
241+
@SerializedName(value = "contentSharingSessions", alternate = {"ContentSharingSessions"})
242+
@Expose
243+
@Nullable
244+
public com.microsoft.graph.requests.ContentSharingSessionCollectionPage contentSharingSessions;
245+
236246
/**
237247
* The Operations.
238248
*
@@ -265,6 +275,10 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
265275
audioRoutingGroups = serializer.deserializeObject(json.get("audioRoutingGroups"), com.microsoft.graph.requests.AudioRoutingGroupCollectionPage.class);
266276
}
267277

278+
if (json.has("contentSharingSessions")) {
279+
contentSharingSessions = serializer.deserializeObject(json.get("contentSharingSessions"), com.microsoft.graph.requests.ContentSharingSessionCollectionPage.class);
280+
}
281+
268282
if (json.has("operations")) {
269283
operations = serializer.deserializeObject(json.get("operations"), com.microsoft.graph.requests.CommsOperationCollectionPage.class);
270284
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ public final AdditionalDataManager additionalDataManager() {
4646
@Nullable
4747
public Boolean hideBotAfterEscalation;
4848

49+
/**
50+
* The Is Content Sharing Notification Enabled.
51+
*
52+
*/
53+
@SerializedName(value = "isContentSharingNotificationEnabled", alternate = {"IsContentSharingNotificationEnabled"})
54+
@Expose
55+
@Nullable
56+
public Boolean isContentSharingNotificationEnabled;
57+
4958

5059
/**
5160
* Sets the raw JSON object
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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.Entity;
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+
import java.util.HashMap;
20+
21+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
22+
23+
/**
24+
* The class for the Content Sharing Session.
25+
*/
26+
public class ContentSharingSession extends Entity implements IJsonBackedObject {
27+
28+
29+
30+
/**
31+
* Sets the raw JSON object
32+
*
33+
* @param serializer the serializer
34+
* @param json the JSON object to set this object to
35+
*/
36+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
37+
38+
}
39+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ public enum RiskDetail
6060
*/
6161
UNKNOWN_FUTURE_VALUE,
6262
/**
63+
* m365DAdmin Dismissed Detection
64+
*/
65+
M365_D_ADMIN_DISMISSED_DETECTION,
66+
/**
6367
* For RiskDetail values that were not expected from the service
6468
*/
6569
UNEXPECTED_VALUE
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
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.X509CertificateAuthenticationModeConfiguration;
13+
import com.microsoft.graph.models.X509CertificateUserBinding;
14+
import com.microsoft.graph.models.AuthenticationMethodConfiguration;
15+
import com.microsoft.graph.requests.AuthenticationMethodTargetCollectionPage;
16+
17+
18+
import com.google.gson.JsonObject;
19+
import com.google.gson.annotations.SerializedName;
20+
import com.google.gson.annotations.Expose;
21+
import javax.annotation.Nullable;
22+
import javax.annotation.Nonnull;
23+
24+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
25+
26+
/**
27+
* The class for the X509Certificate Authentication Method Configuration.
28+
*/
29+
public class X509CertificateAuthenticationMethodConfiguration extends AuthenticationMethodConfiguration implements IJsonBackedObject {
30+
31+
32+
/**
33+
* The Authentication Mode Configuration.
34+
*
35+
*/
36+
@SerializedName(value = "authenticationModeConfiguration", alternate = {"AuthenticationModeConfiguration"})
37+
@Expose
38+
@Nullable
39+
public X509CertificateAuthenticationModeConfiguration authenticationModeConfiguration;
40+
41+
/**
42+
* The Certificate User Bindings.
43+
*
44+
*/
45+
@SerializedName(value = "certificateUserBindings", alternate = {"CertificateUserBindings"})
46+
@Expose
47+
@Nullable
48+
public java.util.List<X509CertificateUserBinding> certificateUserBindings;
49+
50+
/**
51+
* The Include Targets.
52+
*
53+
*/
54+
@SerializedName(value = "includeTargets", alternate = {"IncludeTargets"})
55+
@Expose
56+
@Nullable
57+
public com.microsoft.graph.requests.AuthenticationMethodTargetCollectionPage includeTargets;
58+
59+
60+
/**
61+
* Sets the raw JSON object
62+
*
63+
* @param serializer the serializer
64+
* @param json the JSON object to set this object to
65+
*/
66+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
67+
68+
69+
if (json.has("includeTargets")) {
70+
includeTargets = serializer.deserializeObject(json.get("includeTargets"), com.microsoft.graph.requests.AuthenticationMethodTargetCollectionPage.class);
71+
}
72+
}
73+
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Template Source: Enum.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+
8+
9+
/**
10+
* The Enum X509Certificate Authentication Mode.
11+
*/
12+
public enum X509CertificateAuthenticationMode
13+
{
14+
/**
15+
* x509Certificate Single Factor
16+
*/
17+
X509_CERTIFICATE_SINGLE_FACTOR,
18+
/**
19+
* x509Certificate Multi Factor
20+
*/
21+
X509_CERTIFICATE_MULTI_FACTOR,
22+
/**
23+
* unknown Future Value
24+
*/
25+
UNKNOWN_FUTURE_VALUE,
26+
/**
27+
* For X509CertificateAuthenticationMode values that were not expected from the service
28+
*/
29+
UNEXPECTED_VALUE
30+
}

0 commit comments

Comments
 (0)