Skip to content

Commit 34bb276

Browse files
Merge pull request #1515 from microsoftgraph/v1.0/pipelinebuild/121145
Generated models and request builders
2 parents 9afd4b7 + 2033a1d commit 34bb276

36 files changed

+1698
-33
lines changed

CHANGELOG.md

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

1212
### Changed
1313

14+
## [5.66.0] - 2023-07-28
15+
16+
### Added
17+
18+
- Added TeamsAppSettings model and requests.
19+
- Several Evidence models added to the Security namespace. This includes but is not limited to:
20+
- BlobEvidence.
21+
- ContainerEvidence.
22+
- ContainerRegistryEvidence.
23+
- KubernetesClusterEvidence.
24+
- ContainerPortProtocol model.
25+
- Dictionary model.
26+
- FileHashAlgorithm model.
27+
- FileHash model.
28+
1429
## [5.65.0] - 2023-07-20
1530

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

197197

198198

199+
199200

200201

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

@@ -119,5 +119,6 @@ mavenCentralPublishingEnabled=false
119119

120120

121121

122+
122123

123124

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

2424

@@ -96,5 +96,6 @@ private Constants() {
9696

9797

9898

99+
99100

100101

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public final AdditionalDataManager additionalDataManager() {
7878

7979
/**
8080
* The Requested Access Token Version.
81-
* Specifies the access token version expected by this resource. This changes the version and format of the JWT produced independent of the endpoint or client used to request the access token. The endpoint used, v1.0 or v2.0, is chosen by the client and only impacts the version of id_tokens. Resources need to explicitly configure requestedAccessTokenVersion to indicate the supported access token format. Possible values for requestedAccessTokenVersion are 1, 2, or null. If the value is null, this defaults to 1, which corresponds to the v1.0 endpoint. If signInAudience on the application is configured as AzureADandPersonalMicrosoftAccount, the value for this property must be 2
81+
* Specifies the access token version expected by this resource. This changes the version and format of the JWT produced independent of the endpoint or client used to request the access token. The endpoint used, v1.0 or v2.0, is chosen by the client and only impacts the version of id_tokens. Resources need to explicitly configure requestedAccessTokenVersion to indicate the supported access token format. Possible values for requestedAccessTokenVersion are 1, 2, or null. If the value is null, this defaults to 1, which corresponds to the v1.0 endpoint. If signInAudience on the application is configured as AzureADandPersonalMicrosoftAccount or PersonalMicrosoftAccount, the value for this property must be 2.
8282
*/
8383
@SerializedName(value = "requestedAccessTokenVersion", alternate = {"RequestedAccessTokenVersion"})
8484
@Expose

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.http.BaseCollectionPage;
12+
import com.microsoft.graph.models.ConditionalAccessFilter;
1213

1314

1415
import com.google.gson.JsonObject;
@@ -38,6 +39,15 @@ public final AdditionalDataManager additionalDataManager() {
3839
return additionalDataManager;
3940
}
4041

42+
/**
43+
* The Application Filter.
44+
*
45+
*/
46+
@SerializedName(value = "applicationFilter", alternate = {"ApplicationFilter"})
47+
@Expose
48+
@Nullable
49+
public ConditionalAccessFilter applicationFilter;
50+
4151
/**
4252
* The Exclude Applications.
4353
* Can be one of the following: The list of client IDs (appId) explicitly excluded from the policy. Office365 - For the list of apps included in Office365, see Conditional Access target apps: Office 365

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.http.BaseCollectionPage;
12+
import com.microsoft.graph.models.ConditionalAccessFilter;
1213

1314

1415
import com.google.gson.JsonObject;
@@ -56,6 +57,15 @@ public final AdditionalDataManager additionalDataManager() {
5657
@Nullable
5758
public java.util.List<String> includeServicePrincipals;
5859

60+
/**
61+
* The Service Principal Filter.
62+
*
63+
*/
64+
@SerializedName(value = "servicePrincipalFilter", alternate = {"ServicePrincipalFilter"})
65+
@Expose
66+
@Nullable
67+
public ConditionalAccessFilter servicePrincipalFilter;
68+
5969

6070
/**
6171
* Sets the raw JSON object

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public final AdditionalDataManager additionalDataManager() {
4848

4949
/**
5050
* The Locked Out.
51-
*
51+
* The number of units that are locked out because the customer cancelled their subscription of the service SKU.
5252
*/
5353
@SerializedName(value = "lockedOut", alternate = {"LockedOut"})
5454
@Expose

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

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

3131
/**
3232
* The Account Id.
33-
*
33+
* The unique ID of the account this SKU belongs to.
3434
*/
3535
@SerializedName(value = "accountId", alternate = {"AccountId"})
3636
@Expose
@@ -39,7 +39,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {
3939

4040
/**
4141
* The Account Name.
42-
*
42+
* The name of the account this SKU belongs to.
4343
*/
4444
@SerializedName(value = "accountName", alternate = {"AccountName"})
4545
@Expose
@@ -48,7 +48,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {
4848

4949
/**
5050
* The Applies To.
51-
* For example, 'User' or 'Company'.
51+
* The target class for this SKU. Only SKUs with target class User are assignable. Possible values are: 'User', 'Company'.
5252
*/
5353
@SerializedName(value = "appliesTo", alternate = {"AppliesTo"})
5454
@Expose
@@ -57,7 +57,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {
5757

5858
/**
5959
* The Capability Status.
60-
* Possible values are: Enabled, Warning, Suspended, Deleted, LockedOut. The capabilityStatus is Enabled if the prepaidUnits property has at least 1 unit that is enabled, and LockedOut if the customer cancelled their subscription.
60+
* Enabled indicates that the prepaidUnits property has at least one unit that is enabled. LockedOut indicates that the customer cancelled their subscription. Possible values are: Enabled, Warning, Suspended, Deleted, LockedOut.
6161
*/
6262
@SerializedName(value = "capabilityStatus", alternate = {"CapabilityStatus"})
6363
@Expose
@@ -84,7 +84,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {
8484

8585
/**
8686
* The Service Plans.
87-
* Information about the service plans that are available with the SKU. Not nullable
87+
* Information about the service plans that are available with the SKU. Not nullable.
8888
*/
8989
@SerializedName(value = "servicePlans", alternate = {"ServicePlans"})
9090
@Expose
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.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+
20+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
21+
22+
/**
23+
* The class for the Teams App Settings.
24+
*/
25+
public class TeamsAppSettings extends Entity implements IJsonBackedObject {
26+
27+
28+
/**
29+
* The Allow User Requests For App Access.
30+
*
31+
*/
32+
@SerializedName(value = "allowUserRequestsForAppAccess", alternate = {"AllowUserRequestsForAppAccess"})
33+
@Expose
34+
@Nullable
35+
public Boolean allowUserRequestsForAppAccess;
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+
}

0 commit comments

Comments
 (0)