Skip to content

Commit 0ff3e3e

Browse files
authored
Merge pull request #174 from microsoftgraph/beta/pipelinebuild/56151
Generated beta models and request builders using Typewriter
2 parents c51ba2d + 65cee8d commit 0ff3e3e

18 files changed

+360
-10
lines changed

CHANGELOG.md

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

1212
### Changed
1313

14+
## [0.29.0] - 2021-09-24
15+
16+
### Added
17+
18+
### Changed
19+
20+
- Generated beta models and request builders using Typewriter
21+
1422
## [0.28.0] - 2021-09-17
1523

1624
### Added

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
2121
dependencies {
2222
// Include the sdk as a dependency
23-
implementation 'com.microsoft.graph:microsoft-graph-beta:0.28.0-SNAPSHOT'
23+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.29.0-SNAPSHOT'
2424
// Uncomment the line below if you are building an android application
2525
//implementation 'com.google.guava:guava:30.1.1-android'
2626
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
@@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
3737
<!-- Include the sdk as a dependency -->
3838
<groupId>com.microsoft.graph</groupId>
3939
<artifactId>microsoft-graph-beta</artifactId>
40-
<version>0.28.0-SNAPSHOT</version>
40+
<version>0.29.0-SNAPSHOT</version>
4141
</dependency>
4242
<dependency>
4343
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -166,5 +166,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
166166

167167

168168

169+
169170

170171

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

@@ -65,5 +65,6 @@ mavenCentralPublishingEnabled=false
6565

6666

6767

68+
6869

6970

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

2424

@@ -40,5 +40,6 @@ private Constants() {
4040

4141

4242

43+
4344

4445

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class CloudPcProvisioningPolicy extends Entity implements IJsonBackedObje
5858

5959
/**
6060
* The Image Id.
61-
* The ID of the OS image you want to provision on Cloud PCs. The format for a gallery type image is: {publisher_offer_sku}.
61+
* The ID of the OS image you want to provision on Cloud PCs. The format for a gallery type image is: {publisher_offer_sku}. Supported values for each of the parameters are as follows:publisher: Microsoftwindowsdesktop. offer: windows-ent-cpc. sku: 21h1-ent-cpc-m365, 21h1-ent-cpc-os, 20h2-ent-cpc-m365, 20h2-ent-cpc-os, 20h1-ent-cpc-m365, 20h1-ent-cpc-os, 19h2-ent-cpc-m365 and 19h2-ent-cpc-os.
6262
*/
6363
@SerializedName(value = "imageId", alternate = {"ImageId"})
6464
@Expose

src/main/java/com/microsoft/graph/models/ConditionalAccessSessionControls.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.models.ApplicationEnforcedRestrictionsSessionControl;
1212
import com.microsoft.graph.models.CloudAppSecuritySessionControl;
13+
import com.microsoft.graph.models.ContinuousAccessEvaluationSessionControl;
1314
import com.microsoft.graph.models.PersistentBrowserSessionControl;
1415
import com.microsoft.graph.models.SignInFrequencySessionControl;
1516

@@ -59,6 +60,15 @@ public final AdditionalDataManager additionalDataManager() {
5960
@Nullable
6061
public CloudAppSecuritySessionControl cloudAppSecurity;
6162

63+
/**
64+
* The Continuous Access Evaluation.
65+
*
66+
*/
67+
@SerializedName(value = "continuousAccessEvaluation", alternate = {"ContinuousAccessEvaluation"})
68+
@Expose
69+
@Nullable
70+
public ContinuousAccessEvaluationSessionControl continuousAccessEvaluation;
71+
6272
/**
6373
* The Disable Resilience Defaults.
6474
* Session control that determines whether it is acceptable for Azure AD to extend existing sessions based on information collected prior to an outage or not.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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 Continuous Access Evaluation Mode.
11+
*/
12+
public enum ContinuousAccessEvaluationMode
13+
{
14+
/**
15+
* strict Enforcement
16+
*/
17+
STRICT_ENFORCEMENT,
18+
/**
19+
* disabled
20+
*/
21+
DISABLED,
22+
/**
23+
* unknown Future Value
24+
*/
25+
UNKNOWN_FUTURE_VALUE,
26+
/**
27+
* For ContinuousAccessEvaluationMode values that were not expected from the service
28+
*/
29+
UNEXPECTED_VALUE
30+
}
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.ContinuousAccessEvaluationMode;
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 Continuous Access Evaluation Session Control.
24+
*/
25+
public class ContinuousAccessEvaluationSessionControl 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+
*
44+
*/
45+
@SerializedName(value = "mode", alternate = {"Mode"})
46+
@Expose
47+
@Nullable
48+
public ContinuousAccessEvaluationMode mode;
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/EducationAddToCalendarOptions.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ public enum EducationAddToCalendarOptions
2828
*/
2929
UNKNOWN_FUTURE_VALUE,
3030
/**
31+
* students Only
32+
*/
33+
STUDENTS_ONLY,
34+
/**
3135
* For EducationAddToCalendarOptions values that were not expected from the service
3236
*/
3337
UNEXPECTED_VALUE

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

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

5252
/**
5353
* The Add To Calendar Action.
54-
* Optional field to control the assignment behavior for adding assignments to students' and teachers' calendars when the assignment is published. Possible values are: studentsAndPublisher, studentsAndTeamOwners, none. Default value is none.
54+
* Optional field to control the assignment behavior for adding assignments to students' and teachers' calendars when the assignment is published. Possible values are: none, studentsAndPublisher, studentsAndTeamOwners, studentsOnly and unknownFutureValue. Default value is none.
5555
*/
5656
@SerializedName(value = "addToCalendarAction", alternate = {"AddToCalendarAction"})
5757
@Expose

0 commit comments

Comments
 (0)