Skip to content

Commit 8e185ec

Browse files
baywetbaywet
authored
Merge pull request #120 from microsoftgraph/beta/pipelinebuild/51346
Generated beta models and request builders using Typewriter
2 parents d941542 + 0e51282 commit 8e185ec

File tree

133 files changed

+14039
-705
lines changed

Some content is hidden

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

133 files changed

+14039
-705
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.18.0-SNAPSHOT'
22+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.19.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.18.0-SNAPSHOT</version>
39+
<version>0.19.0-SNAPSHOT</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -158,3 +158,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
158158

159159

160160

161+

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

@@ -57,3 +57,4 @@ mavenCentralPublishingEnabled=false
5757

5858

5959

60+

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

2424

@@ -32,3 +32,4 @@ private Constants() {
3232

3333

3434

35+

‎src/main/java/com/microsoft/graph/managedtenants/models/DelegatedPrivilegeStatus.java‎

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.managedtenants.models;
7+
8+
9+
/**
10+
* The Enum Delegated Privilege Status.
11+
*/
12+
public enum DelegatedPrivilegeStatus
13+
{
14+
/**
15+
* none
16+
*/
17+
NONE,
18+
/**
19+
* delegated Admin Privileges
20+
*/
21+
DELEGATED_ADMIN_PRIVILEGES,
22+
/**
23+
* unknown Future Value
24+
*/
25+
UNKNOWN_FUTURE_VALUE,
26+
/**
27+
* For DelegatedPrivilegeStatus values that were not expected from the service
28+
*/
29+
UNEXPECTED_VALUE
30+
}

‎src/main/java/com/microsoft/graph/managedtenants/models/ManagedTenant.java‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,16 @@
1818
import com.microsoft.graph.managedtenants.models.DeviceCompliancePolicySettingStateSummary;
1919
import com.microsoft.graph.managedtenants.models.ManagedDeviceCompliance;
2020
import com.microsoft.graph.managedtenants.models.ManagedDeviceComplianceTrend;
21+
import com.microsoft.graph.managedtenants.models.ManagementAction;
22+
import com.microsoft.graph.managedtenants.models.ManagementActionTenantDeploymentStatus;
23+
import com.microsoft.graph.managedtenants.models.ManagementIntent;
24+
import com.microsoft.graph.managedtenants.models.ManagementTemplate;
2125
import com.microsoft.graph.managedtenants.models.RiskyUser;
26+
import com.microsoft.graph.managedtenants.models.TenantGroup;
27+
import com.microsoft.graph.managedtenants.models.Tenant;
28+
import com.microsoft.graph.managedtenants.models.TenantCustomizedInformation;
29+
import com.microsoft.graph.managedtenants.models.TenantDetailedInformation;
30+
import com.microsoft.graph.managedtenants.models.TenantTag;
2231
import com.microsoft.graph.managedtenants.models.WindowsDeviceMalwareState;
2332
import com.microsoft.graph.managedtenants.models.WindowsProtectionState;
2433
import com.microsoft.graph.models.Entity;
@@ -31,7 +40,16 @@
3140
import com.microsoft.graph.managedtenants.requests.DeviceCompliancePolicySettingStateSummaryCollectionPage;
3241
import com.microsoft.graph.managedtenants.requests.ManagedDeviceComplianceCollectionPage;
3342
import com.microsoft.graph.managedtenants.requests.ManagedDeviceComplianceTrendCollectionPage;
43+
import com.microsoft.graph.managedtenants.requests.ManagementActionCollectionPage;
44+
import com.microsoft.graph.managedtenants.requests.ManagementActionTenantDeploymentStatusCollectionPage;
45+
import com.microsoft.graph.managedtenants.requests.ManagementIntentCollectionPage;
46+
import com.microsoft.graph.managedtenants.requests.ManagementTemplateCollectionPage;
3447
import com.microsoft.graph.managedtenants.requests.RiskyUserCollectionPage;
48+
import com.microsoft.graph.managedtenants.requests.TenantGroupCollectionPage;
49+
import com.microsoft.graph.managedtenants.requests.TenantCollectionPage;
50+
import com.microsoft.graph.managedtenants.requests.TenantCustomizedInformationCollectionPage;
51+
import com.microsoft.graph.managedtenants.requests.TenantDetailedInformationCollectionPage;
52+
import com.microsoft.graph.managedtenants.requests.TenantTagCollectionPage;
3553
import com.microsoft.graph.managedtenants.requests.WindowsDeviceMalwareStateCollectionPage;
3654
import com.microsoft.graph.managedtenants.requests.WindowsProtectionStateCollectionPage;
3755

@@ -131,6 +149,42 @@ public class ManagedTenant extends Entity implements IJsonBackedObject {
131149
@Nullable
132150
public ManagedDeviceComplianceTrendCollectionPage managedDeviceComplianceTrends;
133151

152+
/**
153+
* The Management Actions.
154+
*
155+
*/
156+
@SerializedName(value = "managementActions", alternate = {"ManagementActions"})
157+
@Expose
158+
@Nullable
159+
public ManagementActionCollectionPage managementActions;
160+
161+
/**
162+
* The Management Action Tenant Deployment Statuses.
163+
*
164+
*/
165+
@SerializedName(value = "managementActionTenantDeploymentStatuses", alternate = {"ManagementActionTenantDeploymentStatuses"})
166+
@Expose
167+
@Nullable
168+
public ManagementActionTenantDeploymentStatusCollectionPage managementActionTenantDeploymentStatuses;
169+
170+
/**
171+
* The Management Intents.
172+
*
173+
*/
174+
@SerializedName(value = "managementIntents", alternate = {"ManagementIntents"})
175+
@Expose
176+
@Nullable
177+
public ManagementIntentCollectionPage managementIntents;
178+
179+
/**
180+
* The Management Templates.
181+
*
182+
*/
183+
@SerializedName(value = "managementTemplates", alternate = {"ManagementTemplates"})
184+
@Expose
185+
@Nullable
186+
public ManagementTemplateCollectionPage managementTemplates;
187+
134188
/**
135189
* The Risky Users.
136190
*
@@ -140,6 +194,51 @@ public class ManagedTenant extends Entity implements IJsonBackedObject {
140194
@Nullable
141195
public RiskyUserCollectionPage riskyUsers;
142196

197+
/**
198+
* The Tenant Groups.
199+
*
200+
*/
201+
@SerializedName(value = "tenantGroups", alternate = {"TenantGroups"})
202+
@Expose
203+
@Nullable
204+
public TenantGroupCollectionPage tenantGroups;
205+
206+
/**
207+
* The Tenants.
208+
*
209+
*/
210+
@SerializedName(value = "tenants", alternate = {"Tenants"})
211+
@Expose
212+
@Nullable
213+
public TenantCollectionPage tenants;
214+
215+
/**
216+
* The Tenants Customized Information.
217+
*
218+
*/
219+
@SerializedName(value = "tenantsCustomizedInformation", alternate = {"TenantsCustomizedInformation"})
220+
@Expose
221+
@Nullable
222+
public TenantCustomizedInformationCollectionPage tenantsCustomizedInformation;
223+
224+
/**
225+
* The Tenants Detailed Information.
226+
*
227+
*/
228+
@SerializedName(value = "tenantsDetailedInformation", alternate = {"TenantsDetailedInformation"})
229+
@Expose
230+
@Nullable
231+
public TenantDetailedInformationCollectionPage tenantsDetailedInformation;
232+
233+
/**
234+
* The Tenant Tags.
235+
*
236+
*/
237+
@SerializedName(value = "tenantTags", alternate = {"TenantTags"})
238+
@Expose
239+
@Nullable
240+
public TenantTagCollectionPage tenantTags;
241+
143242
/**
144243
* The Windows Device Malware States.
145244
*
@@ -204,10 +303,46 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
204303
managedDeviceComplianceTrends = serializer.deserializeObject(json.get("managedDeviceComplianceTrends"), ManagedDeviceComplianceTrendCollectionPage.class);
205304
}
206305

306+
if (json.has("managementActions")) {
307+
managementActions = serializer.deserializeObject(json.get("managementActions"), ManagementActionCollectionPage.class);
308+
}
309+
310+
if (json.has("managementActionTenantDeploymentStatuses")) {
311+
managementActionTenantDeploymentStatuses = serializer.deserializeObject(json.get("managementActionTenantDeploymentStatuses"), ManagementActionTenantDeploymentStatusCollectionPage.class);
312+
}
313+
314+
if (json.has("managementIntents")) {
315+
managementIntents = serializer.deserializeObject(json.get("managementIntents"), ManagementIntentCollectionPage.class);
316+
}
317+
318+
if (json.has("managementTemplates")) {
319+
managementTemplates = serializer.deserializeObject(json.get("managementTemplates"), ManagementTemplateCollectionPage.class);
320+
}
321+
207322
if (json.has("riskyUsers")) {
208323
riskyUsers = serializer.deserializeObject(json.get("riskyUsers"), RiskyUserCollectionPage.class);
209324
}
210325

326+
if (json.has("tenantGroups")) {
327+
tenantGroups = serializer.deserializeObject(json.get("tenantGroups"), TenantGroupCollectionPage.class);
328+
}
329+
330+
if (json.has("tenants")) {
331+
tenants = serializer.deserializeObject(json.get("tenants"), TenantCollectionPage.class);
332+
}
333+
334+
if (json.has("tenantsCustomizedInformation")) {
335+
tenantsCustomizedInformation = serializer.deserializeObject(json.get("tenantsCustomizedInformation"), TenantCustomizedInformationCollectionPage.class);
336+
}
337+
338+
if (json.has("tenantsDetailedInformation")) {
339+
tenantsDetailedInformation = serializer.deserializeObject(json.get("tenantsDetailedInformation"), TenantDetailedInformationCollectionPage.class);
340+
}
341+
342+
if (json.has("tenantTags")) {
343+
tenantTags = serializer.deserializeObject(json.get("tenantTags"), TenantTagCollectionPage.class);
344+
}
345+
211346
if (json.has("windowsDeviceMalwareStates")) {
212347
windowsDeviceMalwareStates = serializer.deserializeObject(json.get("windowsDeviceMalwareStates"), WindowsDeviceMalwareStateCollectionPage.class);
213348
}

‎src/main/java/com/microsoft/graph/managedtenants/models/ManagedTenantExecutionError.java‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
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.managedtenants.models.ManagedTenantOperationError;
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 Managed Tenant Execution Error.
24+
*/
25+
public class ManagedTenantExecutionError extends ManagedTenantOperationError implements IJsonBackedObject {
26+
27+
28+
/**
29+
* The Error Details.
30+
*
31+
*/
32+
@SerializedName(value = "errorDetails", alternate = {"ErrorDetails"})
33+
@Expose
34+
@Nullable
35+
public String errorDetails;
36+
37+
/**
38+
* The Node Id.
39+
*
40+
*/
41+
@SerializedName(value = "nodeId", alternate = {"NodeId"})
42+
@Expose
43+
@Nullable
44+
public Integer nodeId;
45+
46+
/**
47+
* The Raw Token.
48+
*
49+
*/
50+
@SerializedName(value = "rawToken", alternate = {"RawToken"})
51+
@Expose
52+
@Nullable
53+
public String rawToken;
54+
55+
/**
56+
* The Statement Index.
57+
*
58+
*/
59+
@SerializedName(value = "statementIndex", alternate = {"StatementIndex"})
60+
@Expose
61+
@Nullable
62+
public Integer statementIndex;
63+
64+
65+
/**
66+
* Sets the raw JSON object
67+
*
68+
* @param serializer the serializer
69+
* @param json the JSON object to set this object to
70+
*/
71+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
72+
73+
}
74+
}

‎src/main/java/com/microsoft/graph/managedtenants/models/ManagedTenantGenericError.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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.managedtenants.models.ManagedTenantOperationError;
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 Managed Tenant Generic Error.
24+
*/
25+
public class ManagedTenantGenericError extends ManagedTenantOperationError implements IJsonBackedObject {
26+
27+
28+
29+
/**
30+
* Sets the raw JSON object
31+
*
32+
* @param serializer the serializer
33+
* @param json the JSON object to set this object to
34+
*/
35+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
36+
37+
}
38+
}

0 commit comments

Comments
 (0)