Skip to content

Commit 9fde98f

Browse files
Merge pull request #917 from microsoftgraph/v1.0/pipelinebuild/56949
Generated v1.0 models and request builders using Typewriter
2 parents 1002f25 + c43d1dd commit 9fde98f

File tree

81 files changed

+2773
-203
lines changed

Some content is hidden

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

81 files changed

+2773
-203
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.4.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.5.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.4.0</version>
39+
<version>5.5.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -138,3 +138,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
138138

139139

140140

141+

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

@@ -60,4 +60,5 @@ mavenCentralPublishingEnabled=false
6060

6161

6262

63+
6364

src/main/java/com/microsoft/graph/externalconnectors/models/ExternalConnection.java

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

7474
/**
7575
* The Groups.
76-
*
76+
* Read-only. Nullable.
7777
*/
7878
@SerializedName(value = "groups", alternate = {"Groups"})
7979
@Expose

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

2424

@@ -38,3 +38,4 @@ private Constants() {
3838

3939

4040

41+
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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.ActionResultPart;
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 Aad User Conversation Member Result.
24+
*/
25+
public class AadUserConversationMemberResult extends ActionResultPart implements IJsonBackedObject {
26+
27+
28+
/**
29+
* The User Id.
30+
* The user object ID of the Azure AD user that was being added as part of the bulk operation.
31+
*/
32+
@SerializedName(value = "userId", alternate = {"UserId"})
33+
@Expose
34+
@Nullable
35+
public String userId;
36+
37+
38+
/**
39+
* Sets the raw JSON object
40+
*
41+
* @param serializer the serializer
42+
* @param json the JSON object to set this object to
43+
*/
44+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
45+
46+
}
47+
}
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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.PublicError;
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 Action Result Part.
24+
*/
25+
public class ActionResultPart implements IJsonBackedObject {
26+
27+
/** the OData type of the object as returned by the service */
28+
@SerializedName("@odata.type")
29+
@Expose
30+
@Nullable
31+
public String oDataType;
32+
33+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
34+
35+
@Override
36+
@Nonnull
37+
public final AdditionalDataManager additionalDataManager() {
38+
return additionalDataManager;
39+
}
40+
41+
/**
42+
* The Error.
43+
* The error that occurred, if any, during the course of the bulk operation.
44+
*/
45+
@SerializedName(value = "error", alternate = {"Error"})
46+
@Expose
47+
@Nullable
48+
public PublicError error;
49+
50+
51+
/**
52+
* Sets the raw JSON object
53+
*
54+
* @param serializer the serializer
55+
* @param json the JSON object to set this object to
56+
*/
57+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
58+
59+
}
60+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
248248

249249
/**
250250
* The Required Resource Access.
251-
* Specifies the resources that the application needs to access. This property also specifies the set of OAuth permission scopes and application roles that it needs for each of those resources. This configuration of access to the required resources drives the consent experience. Not nullable. Supports $filter (eq, NOT, ge, le).
251+
* Specifies the resources that the application needs to access. This property also specifies the set of delegated permissions and application roles that it needs for each of those resources. This configuration of access to the required resources drives the consent experience. No more than 50 resource services (APIs) can be configured. Beginning mid-October 2021, the total number of required permissions must not exceed 400. Not nullable. Supports $filter (eq, NOT, ge, le).
252252
*/
253253
@SerializedName(value = "requiredResourceAccess", alternate = {"RequiredResourceAccess"})
254254
@Expose

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.microsoft.graph.serializer.IJsonBackedObject;
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
11+
import com.microsoft.graph.http.BaseCollectionPage;
1112

1213

1314
import com.google.gson.JsonObject;
@@ -57,22 +58,40 @@ public final AdditionalDataManager additionalDataManager() {
5758

5859
/**
5960
* The Toll Free Number.
60-
* The toll-free number that connects to the Audio Conference Provider.
61+
*
6162
*/
6263
@SerializedName(value = "tollFreeNumber", alternate = {"TollFreeNumber"})
6364
@Expose
6465
@Nullable
6566
public String tollFreeNumber;
6667

68+
/**
69+
* The Toll Free Numbers.
70+
* List of toll-free numbers that are displayed in the meeting invite.
71+
*/
72+
@SerializedName(value = "tollFreeNumbers", alternate = {"TollFreeNumbers"})
73+
@Expose
74+
@Nullable
75+
public java.util.List<String> tollFreeNumbers;
76+
6777
/**
6878
* The Toll Number.
69-
* The toll number that connects to the Audio Conference Provider.
79+
*
7080
*/
7181
@SerializedName(value = "tollNumber", alternate = {"TollNumber"})
7282
@Expose
7383
@Nullable
7484
public String tollNumber;
7585

86+
/**
87+
* The Toll Numbers.
88+
* List of toll numbers that are displayed in the meeting invite.
89+
*/
90+
@SerializedName(value = "tollNumbers", alternate = {"TollNumbers"})
91+
@Expose
92+
@Nullable
93+
public java.util.List<String> tollNumbers;
94+
7695

7796
/**
7897
* Sets the raw JSON object

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package com.microsoft.graph.models;
77

88
import com.microsoft.graph.models.InvitationParticipantInfo;
9+
import com.microsoft.graph.models.ParticipantInfo;
910
import com.google.gson.annotations.Expose;
1011
import com.google.gson.annotations.SerializedName;
1112
import javax.annotation.Nonnull;
@@ -29,6 +30,15 @@ public class CallTransferParameterSet {
2930
@Nullable
3031
public InvitationParticipantInfo transferTarget;
3132

33+
/**
34+
* The transferee.
35+
*
36+
*/
37+
@SerializedName(value = "transferee", alternate = {"Transferee"})
38+
@Expose
39+
@Nullable
40+
public ParticipantInfo transferee;
41+
3242

3343
/**
3444
* Instiaciates a new CallTransferParameterSet
@@ -40,6 +50,7 @@ public CallTransferParameterSet() {}
4050
*/
4151
protected CallTransferParameterSet(@Nonnull final CallTransferParameterSetBuilder builder) {
4252
this.transferTarget = builder.transferTarget;
53+
this.transferee = builder.transferee;
4354
}
4455
/**
4556
* Gets a new builder for the body
@@ -68,6 +79,21 @@ public CallTransferParameterSetBuilder withTransferTarget(@Nullable final Invita
6879
this.transferTarget = val;
6980
return this;
7081
}
82+
/**
83+
* The transferee parameter value
84+
*/
85+
@Nullable
86+
protected ParticipantInfo transferee;
87+
/**
88+
* Sets the Transferee
89+
* @param val the value to set it to
90+
* @return the current builder object
91+
*/
92+
@Nonnull
93+
public CallTransferParameterSetBuilder withTransferee(@Nullable final ParticipantInfo val) {
94+
this.transferee = val;
95+
return this;
96+
}
7197
/**
7298
* Instanciates a new CallTransferParameterSetBuilder
7399
*/
@@ -92,6 +118,9 @@ public java.util.List<com.microsoft.graph.options.FunctionOption> getFunctionOpt
92118
if(this.transferTarget != null) {
93119
result.add(new com.microsoft.graph.options.FunctionOption("transferTarget", transferTarget));
94120
}
121+
if(this.transferee != null) {
122+
result.add(new com.microsoft.graph.options.FunctionOption("transferee", transferee));
123+
}
95124
return result;
96125
}
97126
}

0 commit comments

Comments
 (0)