Skip to content

Commit 3597f9c

Browse files
Microsoft Graph DevX ToolingMicrosoft Graph DevX Tooling
Microsoft Graph DevX Tooling
authored and
Microsoft Graph DevX Tooling
committed
Update generated files with build 56151
1 parent 592a628 commit 3597f9c

File tree

8 files changed

+174
-6
lines changed

8 files changed

+174
-6
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.3.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.4.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.3.0</version>
39+
<version>5.4.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -137,3 +137,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
137137

138138

139139

140+

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

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

6161

6262

63+

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

2424

@@ -37,3 +37,4 @@ private Constants() {
3737

3838

3939

40+

‎src/main/java/com/microsoft/graph/models/ConditionalAccessConditionSet.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.microsoft.graph.http.BaseCollectionPage;
1212
import com.microsoft.graph.models.ConditionalAccessApplications;
1313
import com.microsoft.graph.models.ConditionalAccessClientApp;
14+
import com.microsoft.graph.models.ConditionalAccessDevices;
1415
import com.microsoft.graph.models.ConditionalAccessLocations;
1516
import com.microsoft.graph.models.ConditionalAccessPlatforms;
1617
import com.microsoft.graph.models.RiskLevel;
@@ -62,6 +63,15 @@ public final AdditionalDataManager additionalDataManager() {
6263
@Nullable
6364
public java.util.List<ConditionalAccessClientApp> clientAppTypes;
6465

66+
/**
67+
* The Devices.
68+
* Devices in the policy.
69+
*/
70+
@SerializedName(value = "devices", alternate = {"Devices"})
71+
@Expose
72+
@Nullable
73+
public ConditionalAccessDevices devices;
74+
6575
/**
6676
* The Locations.
6777
* Locations included in and excluded from the policy.

‎src/main/java/com/microsoft/graph/models/ConditionalAccessDevices.java‎

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.ConditionalAccessFilter;
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 Conditional Access Devices.
24+
*/
25+
public class ConditionalAccessDevices 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 Device Filter.
43+
* Filter defining the dynamic-device-syntax rule to include/exclude devices. A filter can use device properties (such as extension attributes) to include/exclude them. Cannot be set if includeDevices or excludeDevices is set.
44+
*/
45+
@SerializedName(value = "deviceFilter", alternate = {"DeviceFilter"})
46+
@Expose
47+
@Nullable
48+
public ConditionalAccessFilter deviceFilter;
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/ConditionalAccessFilter.java‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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.FilterMode;
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 Conditional Access Filter.
24+
*/
25+
public class ConditionalAccessFilter 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 Mode.
43+
* Mode to use for the filter. Possible values are include or exclude.
44+
*/
45+
@SerializedName(value = "mode", alternate = {"Mode"})
46+
@Expose
47+
@Nullable
48+
public FilterMode mode;
49+
50+
/**
51+
* The Rule.
52+
* Rule syntax is similar to that used for membership rules for groups in Azure AD. For details, see rules with multiple expressions
53+
*/
54+
@SerializedName(value = "rule", alternate = {"Rule"})
55+
@Expose
56+
@Nullable
57+
public String rule;
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+
}

‎src/main/java/com/microsoft/graph/models/EducationOutcome.java‎

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

2929
/**
3030
* The Last Modified By.
31-
*
31+
* The individual who updated the resource.
3232
*/
3333
@SerializedName(value = "lastModifiedBy", alternate = {"LastModifiedBy"})
3434
@Expose
@@ -37,7 +37,7 @@ public class EducationOutcome extends Entity implements IJsonBackedObject {
3737

3838
/**
3939
* The Last Modified Date Time.
40-
*
40+
* Moment in time when the resource was last modified. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2021 is 2021-01-01T00:00:00Z.
4141
*/
4242
@SerializedName(value = "lastModifiedDateTime", alternate = {"LastModifiedDateTime"})
4343
@Expose

‎src/main/java/com/microsoft/graph/models/FilterMode.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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 Filter Mode.
11+
*/
12+
public enum FilterMode
13+
{
14+
/**
15+
* include
16+
*/
17+
INCLUDE,
18+
/**
19+
* exclude
20+
*/
21+
EXCLUDE,
22+
/**
23+
* For FilterMode values that were not expected from the service
24+
*/
25+
UNEXPECTED_VALUE
26+
}

0 commit comments

Comments
 (0)