Skip to content

Commit ddb8ccf

Browse files
authored
Merge pull request #1104 from microsoftgraph/v1.0/pipelinebuild/77879
Generated v1.0 models and request builders using Typewriter
2 parents 04e3d8b + c523fe3 commit ddb8ccf

File tree

62 files changed

+3292
-20
lines changed

Some content is hidden

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

62 files changed

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

159159

160160

161+
161162

162163

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

@@ -81,5 +81,6 @@ mavenCentralPublishingEnabled=false
8181

8282

8383

84+
8485

8586

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

2424

@@ -58,5 +58,6 @@ private Constants() {
5858

5959

6060

61+
6162

6263

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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.TeamInfo;
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 Associated Team Info.
24+
*/
25+
public class AssociatedTeamInfo extends TeamInfo implements IJsonBackedObject {
26+
27+
28+
29+
/**
30+
* Sets the raw JSON object
31+
*
32+
* @param serializer the serializer
33+
* @param json the JSON object to set this object to
34+
*/
35+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
36+
37+
}
38+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class BookingStaffMember extends BookingStaffMemberBase implements IJsonB
5757

5858
/**
5959
* The Role.
60-
* The role of the staff member in the business. Possible values are: guest, administrator, viewer, externalGuest and unknownFutureValue. Required.
60+
* The role of the staff member in the business. Possible values are: guest, administrator, viewer, externalGuest, unknownFutureValue, scheduler and member. Note that you must use the Prefer: include-unknown-enum-members request header to get the following value(s) in this evolvable enum: scheduler, member. Required.
6161
*/
6262
@SerializedName(value = "role", alternate = {"Role"})
6363
@Expose

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
import com.microsoft.graph.models.DriveItem;
1414
import com.microsoft.graph.models.ConversationMember;
1515
import com.microsoft.graph.models.ChatMessage;
16+
import com.microsoft.graph.models.SharedWithChannelTeamInfo;
1617
import com.microsoft.graph.models.TeamsTab;
1718
import com.microsoft.graph.models.Entity;
1819
import com.microsoft.graph.requests.ConversationMemberCollectionPage;
1920
import com.microsoft.graph.requests.ChatMessageCollectionPage;
21+
import com.microsoft.graph.requests.SharedWithChannelTeamInfoCollectionPage;
2022
import com.microsoft.graph.requests.TeamsTabCollectionPage;
2123

2224

@@ -88,6 +90,15 @@ public class Channel extends Entity implements IJsonBackedObject {
8890
@Nullable
8991
public ChannelMembershipType membershipType;
9092

93+
/**
94+
* The Tenant Id.
95+
* The ID of the Azure Active Directory tenant.
96+
*/
97+
@SerializedName(value = "tenantId", alternate = {"TenantId"})
98+
@Expose
99+
@Nullable
100+
public String tenantId;
101+
91102
/**
92103
* The Web Url.
93104
* A hyperlink that will go to the channel in Microsoft Teams. This is the URL that you get when you right-click a channel in Microsoft Teams and select Get link to channel. This URL should be treated as an opaque blob, and not parsed. Read-only.
@@ -124,6 +135,15 @@ public class Channel extends Entity implements IJsonBackedObject {
124135
@Nullable
125136
public ChatMessageCollectionPage messages;
126137

138+
/**
139+
* The Shared With Teams.
140+
* A collection of teams with which a channel is shared.
141+
*/
142+
@SerializedName(value = "sharedWithTeams", alternate = {"SharedWithTeams"})
143+
@Expose
144+
@Nullable
145+
public SharedWithChannelTeamInfoCollectionPage sharedWithTeams;
146+
127147
/**
128148
* The Tabs.
129149
* A collection of all the tabs in the channel. A navigation property.
@@ -151,6 +171,10 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
151171
messages = serializer.deserializeObject(json.get("messages"), ChatMessageCollectionPage.class);
152172
}
153173

174+
if (json.has("sharedWithTeams")) {
175+
sharedWithTeams = serializer.deserializeObject(json.get("sharedWithTeams"), SharedWithChannelTeamInfoCollectionPage.class);
176+
}
177+
154178
if (json.has("tabs")) {
155179
tabs = serializer.deserializeObject(json.get("tabs"), TeamsTabCollectionPage.class);
156180
}
Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
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+
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 Channel Does User Have Access Parameter Set.
21+
*/
22+
public class ChannelDoesUserHaveAccessParameterSet {
23+
/**
24+
* The user Id.
25+
*
26+
*/
27+
@SerializedName(value = "userId", alternate = {"UserId"})
28+
@Expose
29+
@Nullable
30+
public String userId;
31+
32+
/**
33+
* The tenant Id.
34+
*
35+
*/
36+
@SerializedName(value = "tenantId", alternate = {"TenantId"})
37+
@Expose
38+
@Nullable
39+
public String tenantId;
40+
41+
/**
42+
* The user Principal Name.
43+
*
44+
*/
45+
@SerializedName(value = "userPrincipalName", alternate = {"UserPrincipalName"})
46+
@Expose
47+
@Nullable
48+
public String userPrincipalName;
49+
50+
51+
/**
52+
* Instiaciates a new ChannelDoesUserHaveAccessParameterSet
53+
*/
54+
public ChannelDoesUserHaveAccessParameterSet() {}
55+
/**
56+
* Instiaciates a new ChannelDoesUserHaveAccessParameterSet
57+
* @param builder builder bearing the parameters to initialize from
58+
*/
59+
protected ChannelDoesUserHaveAccessParameterSet(@Nonnull final ChannelDoesUserHaveAccessParameterSetBuilder builder) {
60+
this.userId = builder.userId;
61+
this.tenantId = builder.tenantId;
62+
this.userPrincipalName = builder.userPrincipalName;
63+
}
64+
/**
65+
* Gets a new builder for the body
66+
* @return a new builder
67+
*/
68+
@Nonnull
69+
public static ChannelDoesUserHaveAccessParameterSetBuilder newBuilder() {
70+
return new ChannelDoesUserHaveAccessParameterSetBuilder();
71+
}
72+
/**
73+
* Fluent builder for the ChannelDoesUserHaveAccessParameterSet
74+
*/
75+
public static final class ChannelDoesUserHaveAccessParameterSetBuilder {
76+
/**
77+
* The userId parameter value
78+
*/
79+
@Nullable
80+
protected String userId;
81+
/**
82+
* Sets the UserId
83+
* @param val the value to set it to
84+
* @return the current builder object
85+
*/
86+
@Nonnull
87+
public ChannelDoesUserHaveAccessParameterSetBuilder withUserId(@Nullable final String val) {
88+
this.userId = val;
89+
return this;
90+
}
91+
/**
92+
* The tenantId parameter value
93+
*/
94+
@Nullable
95+
protected String tenantId;
96+
/**
97+
* Sets the TenantId
98+
* @param val the value to set it to
99+
* @return the current builder object
100+
*/
101+
@Nonnull
102+
public ChannelDoesUserHaveAccessParameterSetBuilder withTenantId(@Nullable final String val) {
103+
this.tenantId = val;
104+
return this;
105+
}
106+
/**
107+
* The userPrincipalName parameter value
108+
*/
109+
@Nullable
110+
protected String userPrincipalName;
111+
/**
112+
* Sets the UserPrincipalName
113+
* @param val the value to set it to
114+
* @return the current builder object
115+
*/
116+
@Nonnull
117+
public ChannelDoesUserHaveAccessParameterSetBuilder withUserPrincipalName(@Nullable final String val) {
118+
this.userPrincipalName = val;
119+
return this;
120+
}
121+
/**
122+
* Instanciates a new ChannelDoesUserHaveAccessParameterSetBuilder
123+
*/
124+
@Nullable
125+
protected ChannelDoesUserHaveAccessParameterSetBuilder(){}
126+
/**
127+
* Buils the resulting body object to be passed to the request
128+
* @return the body object to pass to the request
129+
*/
130+
@Nonnull
131+
public ChannelDoesUserHaveAccessParameterSet build() {
132+
return new ChannelDoesUserHaveAccessParameterSet(this);
133+
}
134+
}
135+
/**
136+
* Gets the functions options from the properties that have been set
137+
* @return a list of function options for the request
138+
*/
139+
@Nonnull
140+
public java.util.List<com.microsoft.graph.options.FunctionOption> getFunctionOptions() {
141+
final ArrayList<com.microsoft.graph.options.FunctionOption> result = new ArrayList<>();
142+
if(this.userId != null) {
143+
result.add(new com.microsoft.graph.options.FunctionOption("userId", userId));
144+
}
145+
if(this.tenantId != null) {
146+
result.add(new com.microsoft.graph.options.FunctionOption("tenantId", tenantId));
147+
}
148+
if(this.userPrincipalName != null) {
149+
result.add(new com.microsoft.graph.options.FunctionOption("userPrincipalName", userPrincipalName));
150+
}
151+
return result;
152+
}
153+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ public enum ChannelMembershipType
2424
*/
2525
UNKNOWN_FUTURE_VALUE,
2626
/**
27+
* shared
28+
*/
29+
SHARED,
30+
/**
2731
* For ChannelMembershipType values that were not expected from the service
2832
*/
2933
UNEXPECTED_VALUE

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

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

3838
/**
3939
* The Roles.
40-
* The roles for that user.
40+
* The roles for that user. This property only contains additional qualifiers when relevant - for example, if the member has owner privileges, the roles property contains owner as one of the values. Similarly, if the member is a guest, the roles property contains guest as one of the values. A basic member should not have any values specified in the roles property.
4141
*/
4242
@SerializedName(value = "roles", alternate = {"Roles"})
4343
@Expose

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class OAuth2PermissionGrant extends Entity implements IJsonBackedObject {
4545

4646
/**
4747
* The Principal Id.
48-
* The id of the user on behalf of whom the client is authorized to access the resource, when consentType is Principal. If consentType is AllPrincipals this value is null. Required when consentType is Principal.
48+
* The id of the user on behalf of whom the client is authorized to access the resource, when consentType is Principal. If consentType is AllPrincipals this value is null. Required when consentType is Principal. Supports $filter (eq only).
4949
*/
5050
@SerializedName(value = "principalId", alternate = {"PrincipalId"})
5151
@Expose
@@ -54,7 +54,7 @@ public class OAuth2PermissionGrant extends Entity implements IJsonBackedObject {
5454

5555
/**
5656
* The Resource Id.
57-
* The id of the resource service principal to which access is authorized. This identifies the API which the client is authorized to attempt to call on behalf of a signed-in user.
57+
* The id of the resource service principal to which access is authorized. This identifies the API which the client is authorized to attempt to call on behalf of a signed-in user. Supports $filter (eq only).
5858
*/
5959
@SerializedName(value = "resourceId", alternate = {"ResourceId"})
6060
@Expose

0 commit comments

Comments
 (0)