Skip to content

Commit 29e11e3

Browse files
Merge pull request #1035 from microsoftgraph/v1.0/pipelinebuild/71164
Generated v1.0 models and request builders using Typewriter
2 parents 34bdcad + 42ebd98 commit 29e11e3

16 files changed

+132
-25
lines changed

CHANGELOG.md

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

1212
### Changed
1313

14+
## [5.18.0] - 2022-03-30
15+
16+
### Added
17+
18+
- ConditionalAccessClientApplications model removed.
19+
20+
### Changed
21+
22+
- Generated v1.0 models and request builders using Typewriter.
23+
- ColumnDefinition, ConditionalAccessConditionSet, & ConditionalAccessDevicePlatform models changed.
24+
1425
## [5.17.0] - 2022-03-17
1526

1627
### 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.17.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.18.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.17.0</version>
39+
<version>5.18.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -151,3 +151,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
151151

152152

153153

154+

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

@@ -72,5 +72,6 @@ mavenCentralPublishingEnabled=false
7272

7373

7474

75+
7576

7677

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

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

4141
/**
4242
* The Type.
43-
* The type of content in the value property. Possible values are: text, html, unknownFutureValue.
43+
* The type of content in the value property. Possible values are: text, html, unknownFutureValue. These are the content types that the indexer supports, and not the file extension types allowed.
4444
*/
4545
@SerializedName(value = "type", alternate = {"Type"})
4646
@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.17.0";
21+
public static final String VERSION_NAME = "5.18.0";
2222
}
2323

2424

@@ -49,5 +49,6 @@ private Constants() {
4949

5050

5151

52+
5253

5354

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class Authentication extends Entity implements IJsonBackedObject {
3636

3737
/**
3838
* The Fido2Methods.
39-
*
39+
* Represents the FIDO2 security keys registered to a user for authentication.
4040
*/
4141
@SerializedName(value = "fido2Methods", alternate = {"Fido2Methods"})
4242
@Expose
@@ -45,7 +45,7 @@ public class Authentication extends Entity implements IJsonBackedObject {
4545

4646
/**
4747
* The Methods.
48-
*
48+
* Represents all authentication methods registered to a user.
4949
*/
5050
@SerializedName(value = "methods", alternate = {"Methods"})
5151
@Expose
@@ -54,7 +54,7 @@ public class Authentication extends Entity implements IJsonBackedObject {
5454

5555
/**
5656
* The Microsoft Authenticator Methods.
57-
*
57+
* The details of the Microsoft Authenticator app registered to a user for authentication.
5858
*/
5959
@SerializedName(value = "microsoftAuthenticatorMethods", alternate = {"MicrosoftAuthenticatorMethods"})
6060
@Expose
@@ -63,7 +63,7 @@ public class Authentication extends Entity implements IJsonBackedObject {
6363

6464
/**
6565
* The Windows Hello For Business Methods.
66-
*
66+
* Represents the Windows Hello for Business authentication method registered to a user for authentication.
6767
*/
6868
@SerializedName(value = "windowsHelloForBusinessMethods", alternate = {"WindowsHelloForBusinessMethods"})
6969
@Expose

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.microsoft.graph.models.LookupColumn;
2121
import com.microsoft.graph.models.NumberColumn;
2222
import com.microsoft.graph.models.PersonOrGroupColumn;
23+
import com.microsoft.graph.models.ContentTypeInfo;
2324
import com.microsoft.graph.models.TermColumn;
2425
import com.microsoft.graph.models.TextColumn;
2526
import com.microsoft.graph.models.ThumbnailColumn;
@@ -268,6 +269,15 @@ public class ColumnDefinition extends Entity implements IJsonBackedObject {
268269
@Nullable
269270
public Boolean required;
270271

272+
/**
273+
* The Source Content Type.
274+
* ContentType from which this column is inherited from. Present only in contentTypes columns response. Read-only.
275+
*/
276+
@SerializedName(value = "sourceContentType", alternate = {"SourceContentType"})
277+
@Expose
278+
@Nullable
279+
public ContentTypeInfo sourceContentType;
280+
271281
/**
272282
* The Term.
273283
* This column stores taxonomy terms.
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.http.BaseCollectionPage;
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 Client Applications.
24+
*/
25+
public class ConditionalAccessClientApplications 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 Exclude Service Principals.
43+
* Service principal IDs excluded from the policy scope.
44+
*/
45+
@SerializedName(value = "excludeServicePrincipals", alternate = {"ExcludeServicePrincipals"})
46+
@Expose
47+
@Nullable
48+
public java.util.List<String> excludeServicePrincipals;
49+
50+
/**
51+
* The Include Service Principals.
52+
* Service principal IDs included in the policy scope, or ServicePrincipalsInMyTenant.
53+
*/
54+
@SerializedName(value = "includeServicePrincipals", alternate = {"IncludeServicePrincipals"})
55+
@Expose
56+
@Nullable
57+
public java.util.List<String> includeServicePrincipals;
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/ConditionalAccessConditionSet.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.http.BaseCollectionPage;
1212
import com.microsoft.graph.models.ConditionalAccessApplications;
13+
import com.microsoft.graph.models.ConditionalAccessClientApplications;
1314
import com.microsoft.graph.models.ConditionalAccessClientApp;
1415
import com.microsoft.graph.models.ConditionalAccessDevices;
1516
import com.microsoft.graph.models.ConditionalAccessLocations;
@@ -54,6 +55,15 @@ public final AdditionalDataManager additionalDataManager() {
5455
@Nullable
5556
public ConditionalAccessApplications applications;
5657

58+
/**
59+
* The Client Applications.
60+
* Client applications (service principals and workload identities) included in and excluded from the policy. Either users or clientApplications is required.
61+
*/
62+
@SerializedName(value = "clientApplications", alternate = {"ClientApplications"})
63+
@Expose
64+
@Nullable
65+
public ConditionalAccessClientApplications clientApplications;
66+
5767
/**
5868
* The Client App Types.
5969
* Client application types included in the policy. Possible values are: all, browser, mobileAppsAndDesktopClients, exchangeActiveSync, easSupported, other. Required.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ public enum ConditionalAccessDevicePlatform
4040
*/
4141
UNKNOWN_FUTURE_VALUE,
4242
/**
43+
* linux
44+
*/
45+
LINUX,
46+
/**
4347
* For ConditionalAccessDevicePlatform values that were not expected from the service
4448
*/
4549
UNEXPECTED_VALUE

0 commit comments

Comments
 (0)