Skip to content

Commit c76b47e

Browse files
Merge pull request #1233 from microsoftgraph/v1.0/pipelinebuild/89257
Generated v1.0 models and request builders using Typewriter
2 parents 863450f + 9b5da77 commit c76b47e

File tree

52 files changed

+2474
-19
lines changed

Some content is hidden

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

52 files changed

+2474
-19
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.39.0] - 2022-10-20
15+
16+
### Added
17+
18+
- AuthenticationMethodFeatureConfiguration model.
19+
- ChatViewpoint model.
20+
- ConditionalAccessPolicyDetail model.
21+
- FeatureTarget models.
22+
- MicrosoftAuthenticatorFeatureSettings model.
23+
- TemplateScenarios model.
24+
- ChatHideForUser models and related requests.
25+
- ChatMarkChatReadForUser models and related requests.
26+
- ChatMarkChatUnreadForUser models and related requests.
27+
- ChatMessageInfo model and related requests.
28+
- ChatUnhideForUser models and related requests.
29+
- ConditionalAccessTemplate model and related requests.
30+
31+
### Changed
32+
33+
- Generated v1.0 models and request builders using Typewriter.
34+
- Classes related to the removed and added models/requests have been updated to reflect the addition and removal of these models/requests.
35+
- Bumped Microsoft-Graph-Core to 2.0.14
36+
1437
## [5.38.0] - 2022-10-12
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.38.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.39.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.38.0</version>
39+
<version>5.39.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -169,5 +169,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
169169

170170

171171

172+
172173

173174

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

@@ -92,5 +92,6 @@ mavenCentralPublishingEnabled=false
9292

9393

9494

95+
9596

9697

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ dependencies {
1111
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
1212

1313
// Core Http library
14-
api 'com.microsoft.graph:microsoft-graph-core:2.0.13'
14+
api 'com.microsoft.graph:microsoft-graph-core:2.0.14'
1515
}

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

2424

@@ -69,5 +69,6 @@ private Constants() {
6969

7070

7171

72+
7273

7374

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.models.FeatureTarget;
12+
import com.microsoft.graph.models.AdvancedConfigState;
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 Authentication Method Feature Configuration.
25+
*/
26+
public class AuthenticationMethodFeatureConfiguration 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 Exclude Target.
44+
* A single entity that is excluded from this feature.
45+
*/
46+
@SerializedName(value = "excludeTarget", alternate = {"ExcludeTarget"})
47+
@Expose
48+
@Nullable
49+
public FeatureTarget excludeTarget;
50+
51+
/**
52+
* The Include Target.
53+
* A single entity that is included in this feature.
54+
*/
55+
@SerializedName(value = "includeTarget", alternate = {"IncludeTarget"})
56+
@Expose
57+
@Nullable
58+
public FeatureTarget includeTarget;
59+
60+
/**
61+
* The State.
62+
* Enable or disable the feature. Possible values are: default, enabled, disabled, unknownFutureValue. The default value is used when the configuration hasn't been explicitly set and uses the default behavior of Azure AD for the setting. The default value is disabled.
63+
*/
64+
@SerializedName(value = "state", alternate = {"State"})
65+
@Expose
66+
@Nullable
67+
public AdvancedConfigState state;
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/Chat.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import com.microsoft.graph.http.BaseCollectionPage;
1212
import com.microsoft.graph.models.ChatType;
1313
import com.microsoft.graph.models.TeamworkOnlineMeetingInfo;
14+
import com.microsoft.graph.models.ChatViewpoint;
15+
import com.microsoft.graph.models.ChatMessageInfo;
1416
import com.microsoft.graph.models.Entity;
1517
import com.microsoft.graph.requests.TeamsAppInstallationCollectionPage;
1618
import com.microsoft.graph.requests.ConversationMemberCollectionPage;
@@ -87,6 +89,15 @@ public class Chat extends Entity implements IJsonBackedObject {
8789
@Nullable
8890
public String topic;
8991

92+
/**
93+
* The Viewpoint.
94+
* Represents caller-specific information about the chat, such as last message read date and time. This property is populated only when the request is made in a delegated context.
95+
*/
96+
@SerializedName(value = "viewpoint", alternate = {"Viewpoint"})
97+
@Expose
98+
@Nullable
99+
public ChatViewpoint viewpoint;
100+
90101
/**
91102
* The Web Url.
92103
* The URL for the chat in Microsoft Teams. The URL should be treated as an opaque blob, and not parsed. Read-only.
@@ -105,6 +116,15 @@ public class Chat extends Entity implements IJsonBackedObject {
105116
@Nullable
106117
public com.microsoft.graph.requests.TeamsAppInstallationCollectionPage installedApps;
107118

119+
/**
120+
* The Last Message Preview.
121+
* Preview of the last message sent in the chat. Null if no messages have been sent in the chat. Currently, only the list chats operation supports this property.
122+
*/
123+
@SerializedName(value = "lastMessagePreview", alternate = {"LastMessagePreview"})
124+
@Expose
125+
@Nullable
126+
public ChatMessageInfo lastMessagePreview;
127+
108128
/**
109129
* The Members.
110130
* A collection of all the members in the chat. Nullable.
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
// Template Source: BaseMethodParameterSet.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+
import com.microsoft.graph.models.TeamworkUserIdentity;
9+
import com.google.gson.annotations.Expose;
10+
import com.google.gson.annotations.SerializedName;
11+
import javax.annotation.Nonnull;
12+
import javax.annotation.Nullable;
13+
import com.google.gson.JsonObject;
14+
import java.util.EnumSet;
15+
import java.util.ArrayList;
16+
17+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
18+
19+
/**
20+
* The class for the Chat Hide For User Parameter Set.
21+
*/
22+
public class ChatHideForUserParameterSet {
23+
/**
24+
* The user.
25+
*
26+
*/
27+
@SerializedName(value = "user", alternate = {"User"})
28+
@Expose
29+
@Nullable
30+
public TeamworkUserIdentity user;
31+
32+
33+
/**
34+
* Instiaciates a new ChatHideForUserParameterSet
35+
*/
36+
public ChatHideForUserParameterSet() {}
37+
/**
38+
* Instiaciates a new ChatHideForUserParameterSet
39+
* @param builder builder bearing the parameters to initialize from
40+
*/
41+
protected ChatHideForUserParameterSet(@Nonnull final ChatHideForUserParameterSetBuilder builder) {
42+
this.user = builder.user;
43+
}
44+
/**
45+
* Gets a new builder for the body
46+
* @return a new builder
47+
*/
48+
@Nonnull
49+
public static ChatHideForUserParameterSetBuilder newBuilder() {
50+
return new ChatHideForUserParameterSetBuilder();
51+
}
52+
/**
53+
* Fluent builder for the ChatHideForUserParameterSet
54+
*/
55+
public static final class ChatHideForUserParameterSetBuilder {
56+
/**
57+
* The user parameter value
58+
*/
59+
@Nullable
60+
protected TeamworkUserIdentity user;
61+
/**
62+
* Sets the User
63+
* @param val the value to set it to
64+
* @return the current builder object
65+
*/
66+
@Nonnull
67+
public ChatHideForUserParameterSetBuilder withUser(@Nullable final TeamworkUserIdentity val) {
68+
this.user = val;
69+
return this;
70+
}
71+
/**
72+
* Instanciates a new ChatHideForUserParameterSetBuilder
73+
*/
74+
@Nullable
75+
protected ChatHideForUserParameterSetBuilder(){}
76+
/**
77+
* Buils the resulting body object to be passed to the request
78+
* @return the body object to pass to the request
79+
*/
80+
@Nonnull
81+
public ChatHideForUserParameterSet build() {
82+
return new ChatHideForUserParameterSet(this);
83+
}
84+
}
85+
/**
86+
* Gets the functions options from the properties that have been set
87+
* @return a list of function options for the request
88+
*/
89+
@Nonnull
90+
public java.util.List<com.microsoft.graph.options.FunctionOption> getFunctionOptions() {
91+
final ArrayList<com.microsoft.graph.options.FunctionOption> result = new ArrayList<>();
92+
if(this.user != null) {
93+
result.add(new com.microsoft.graph.options.FunctionOption("user", user));
94+
}
95+
return result;
96+
}
97+
}

0 commit comments

Comments
 (0)