Skip to content

Commit 7c769fd

Browse files
authored
Merge pull request #113 from microsoftgraph/beta/pipelinebuild/50574
Generated beta models and request builders using Typewriter
2 parents cb18ccd + 9f2fb14 commit 7c769fd

File tree

317 files changed

+30166
-3007
lines changed

Some content is hidden

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

317 files changed

+30166
-3007
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-beta:0.16.0-SNAPSHOT'
22+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.17.0-SNAPSHOT'
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-beta</artifactId>
39-
<version>0.16.0-SNAPSHOT</version>
39+
<version>0.17.0-SNAPSHOT</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -156,3 +156,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
156156

157157

158158

159+

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

@@ -55,3 +55,4 @@ mavenCentralPublishingEnabled=false
5555

5656

5757

58+

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

2424

@@ -30,3 +30,4 @@ private Constants() {
3030

3131

3232

33+
Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
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.managedtenants.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 Aggregated Policy Compliance.
24+
*/
25+
public class AggregatedPolicyCompliance extends Entity implements IJsonBackedObject {
26+
27+
28+
/**
29+
* The Compliance Policy Id.
30+
*
31+
*/
32+
@SerializedName(value = "compliancePolicyId", alternate = {"CompliancePolicyId"})
33+
@Expose
34+
@Nullable
35+
public String compliancePolicyId;
36+
37+
/**
38+
* The Compliance Policy Name.
39+
*
40+
*/
41+
@SerializedName(value = "compliancePolicyName", alternate = {"CompliancePolicyName"})
42+
@Expose
43+
@Nullable
44+
public String compliancePolicyName;
45+
46+
/**
47+
* The Compliance Policy Platform.
48+
*
49+
*/
50+
@SerializedName(value = "compliancePolicyPlatform", alternate = {"CompliancePolicyPlatform"})
51+
@Expose
52+
@Nullable
53+
public String compliancePolicyPlatform;
54+
55+
/**
56+
* The Compliance Policy Type.
57+
*
58+
*/
59+
@SerializedName(value = "compliancePolicyType", alternate = {"CompliancePolicyType"})
60+
@Expose
61+
@Nullable
62+
public String compliancePolicyType;
63+
64+
/**
65+
* The Last Refreshed Date Time.
66+
*
67+
*/
68+
@SerializedName(value = "lastRefreshedDateTime", alternate = {"LastRefreshedDateTime"})
69+
@Expose
70+
@Nullable
71+
public java.time.OffsetDateTime lastRefreshedDateTime;
72+
73+
/**
74+
* The Number Of Compliant Devices.
75+
*
76+
*/
77+
@SerializedName(value = "numberOfCompliantDevices", alternate = {"NumberOfCompliantDevices"})
78+
@Expose
79+
@Nullable
80+
public Long numberOfCompliantDevices;
81+
82+
/**
83+
* The Number Of Error Devices.
84+
*
85+
*/
86+
@SerializedName(value = "numberOfErrorDevices", alternate = {"NumberOfErrorDevices"})
87+
@Expose
88+
@Nullable
89+
public Long numberOfErrorDevices;
90+
91+
/**
92+
* The Number Of Non Compliant Devices.
93+
*
94+
*/
95+
@SerializedName(value = "numberOfNonCompliantDevices", alternate = {"NumberOfNonCompliantDevices"})
96+
@Expose
97+
@Nullable
98+
public Long numberOfNonCompliantDevices;
99+
100+
/**
101+
* The Policy Modified Date Time.
102+
*
103+
*/
104+
@SerializedName(value = "policyModifiedDateTime", alternate = {"PolicyModifiedDateTime"})
105+
@Expose
106+
@Nullable
107+
public java.time.OffsetDateTime policyModifiedDateTime;
108+
109+
/**
110+
* The Tenant Display Name.
111+
*
112+
*/
113+
@SerializedName(value = "tenantDisplayName", alternate = {"TenantDisplayName"})
114+
@Expose
115+
@Nullable
116+
public String tenantDisplayName;
117+
118+
/**
119+
* The Tenant Id.
120+
*
121+
*/
122+
@SerializedName(value = "tenantId", alternate = {"TenantId"})
123+
@Expose
124+
@Nullable
125+
public String tenantId;
126+
127+
128+
/**
129+
* Sets the raw JSON object
130+
*
131+
* @param serializer the serializer
132+
* @param json the JSON object to set this object to
133+
*/
134+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
135+
136+
}
137+
}

src/main/java/com/microsoft/graph/models/EducationFormResource.java renamed to src/main/java/com/microsoft/graph/managedtenants/models/CloudPcConnection.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
44
// ------------------------------------------------------------------------------
55

6-
package com.microsoft.graph.models;
6+
package com.microsoft.graph.managedtenants.models;
77
import com.microsoft.graph.serializer.ISerializer;
88
import com.microsoft.graph.serializer.IJsonBackedObject;
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
11-
import com.microsoft.graph.models.EducationResource;
11+
import com.microsoft.graph.models.Entity;
1212

1313

1414
import com.google.gson.JsonObject;
@@ -20,55 +20,55 @@
2020
// **NOTE** This file was generated by a tool and any changes will be overwritten.
2121

2222
/**
23-
* The class for the Education Form Resource.
23+
* The class for the Cloud Pc Connection.
2424
*/
25-
public class EducationFormResource extends EducationResource implements IJsonBackedObject {
25+
public class CloudPcConnection extends Entity implements IJsonBackedObject {
2626

2727

2828
/**
29-
* The Edit Url.
30-
* Teacher URL for the Form.
29+
* The Display Name.
30+
*
3131
*/
32-
@SerializedName(value = "editUrl", alternate = {"EditUrl"})
32+
@SerializedName(value = "displayName", alternate = {"DisplayName"})
3333
@Expose
3434
@Nullable
35-
public String editUrl;
35+
public String displayName;
3636

3737
/**
38-
* The Form Id.
39-
* Id of the Form.
38+
* The Health Check Status.
39+
*
4040
*/
41-
@SerializedName(value = "formId", alternate = {"FormId"})
41+
@SerializedName(value = "healthCheckStatus", alternate = {"HealthCheckStatus"})
4242
@Expose
4343
@Nullable
44-
public String formId;
44+
public String healthCheckStatus;
4545

4646
/**
47-
* The Is Group Form.
48-
* Whether the Form belongs to a class group.
47+
* The Last Refreshed Date Time.
48+
*
4949
*/
50-
@SerializedName(value = "isGroupForm", alternate = {"IsGroupForm"})
50+
@SerializedName(value = "lastRefreshedDateTime", alternate = {"LastRefreshedDateTime"})
5151
@Expose
5252
@Nullable
53-
public Boolean isGroupForm;
53+
public java.time.OffsetDateTime lastRefreshedDateTime;
5454

5555
/**
56-
* The Original Form Id.
57-
* Original id of the Form.
56+
* The Tenant Display Name.
57+
*
5858
*/
59-
@SerializedName(value = "originalFormId", alternate = {"OriginalFormId"})
59+
@SerializedName(value = "tenantDisplayName", alternate = {"TenantDisplayName"})
6060
@Expose
6161
@Nullable
62-
public String originalFormId;
62+
public String tenantDisplayName;
6363

6464
/**
65-
* The View Url.
66-
* Student URL for the Form.
65+
* The Tenant Id.
66+
*
6767
*/
68-
@SerializedName(value = "viewUrl", alternate = {"ViewUrl"})
68+
@SerializedName(value = "tenantId", alternate = {"TenantId"})
6969
@Expose
7070
@Nullable
71-
public String viewUrl;
71+
public String tenantId;
7272

7373

7474
/**

0 commit comments

Comments
 (0)