Skip to content

Commit d12ac2c

Browse files
authored
Merge pull request #589 from microsoftgraph/v1.0/pipelinebuild/4215307
Generated v1.0 models and request builders using Typewriter
2 parents c0a1eea + 5f98621 commit d12ac2c

File tree

81 files changed

+4340
-371
lines changed

Some content is hidden

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

81 files changed

+4340
-371
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Microsoft Graph SDK for Java
1+
# Microsoft Graph SDK for Java
22

33
[![Download](https://api.bintray.com/packages/microsoftgraph/Maven/microsoft-graph/images/download.svg)](https://bintray.com/microsoftgraph/Maven/microsoft-graph/_latestVersion)
44

@@ -19,7 +19,7 @@ repositories {
1919
2020
dependencies {
2121
// Include the sdk as a dependency
22-
implementation 'com.microsoft.graph:microsoft-graph:2.4.1'
22+
implementation 'com.microsoft.graph:microsoft-graph:2.5.0'
2323
}
2424
```
2525

@@ -31,7 +31,7 @@ Add the dependency in `dependencies` in pom.xml
3131
<dependency>
3232
<groupId>com.microsoft.graph</groupId>
3333
<artifactId>microsoft-graph</artifactId>
34-
<version>2.4.1</version>
34+
<version>2.5.0</version>
3535
</dependency>
3636
```
3737

@@ -119,3 +119,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
119119
## 9. Third-party notices
120120

121121
[Third-party notices](THIRD%20PARTY%20NOTICES)
122+

gradle.properties

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ org.gradle.caching=true
2525

2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph
28-
mavenMajorVersion = 2
29-
mavenMinorVersion = 4
30-
mavenPatchVersion = 1
28+
mavenMajorVersion = 2
29+
mavenMinorVersion = 5
30+
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven
3333

@@ -42,3 +42,4 @@ Password="PASSWORD"
4242
#enable mavenCentralPublishingEnabled to publish to maven central
4343
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
4444
mavenCentralPublishingEnabled=false
45+

src/main/java/com/microsoft/graph/core/Constants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@ private Constants() {
3030
public static final String PASSWORD = "password";
3131
public static final String TENANTID = "tenantid";
3232
public static final String CLIENTSECRET = "clientsecret";
33-
public static final String VERSION_NAME = "2.4.1";
33+
public static final String VERSION_NAME = "2.5.0";
3434
}
35+

src/main/java/com/microsoft/graph/models/extensions/Alert.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,23 @@
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
99
import java.util.EnumSet;
10+
import com.microsoft.graph.models.extensions.AlertDetection;
1011
import com.microsoft.graph.models.extensions.CloudAppSecurityState;
1112
import com.microsoft.graph.models.generated.AlertFeedback;
1213
import com.microsoft.graph.models.extensions.FileSecurityState;
1314
import com.microsoft.graph.models.extensions.AlertHistoryState;
1415
import com.microsoft.graph.models.extensions.HostSecurityState;
16+
import com.microsoft.graph.models.extensions.InvestigationSecurityState;
1517
import com.microsoft.graph.models.extensions.MalwareState;
18+
import com.microsoft.graph.models.extensions.MessageSecurityState;
1619
import com.microsoft.graph.models.extensions.NetworkConnection;
1720
import com.microsoft.graph.models.extensions.Process;
1821
import com.microsoft.graph.models.extensions.RegistryKeyState;
1922
import com.microsoft.graph.models.extensions.SecurityResource;
2023
import com.microsoft.graph.models.generated.AlertSeverity;
2124
import com.microsoft.graph.models.generated.AlertStatus;
2225
import com.microsoft.graph.models.extensions.AlertTrigger;
26+
import com.microsoft.graph.models.extensions.UriClickSecurityState;
2327
import com.microsoft.graph.models.extensions.UserSecurityState;
2428
import com.microsoft.graph.models.extensions.SecurityVendorInformation;
2529
import com.microsoft.graph.models.extensions.VulnerabilityState;
@@ -46,6 +50,14 @@ public class Alert extends Entity implements IJsonBackedObject {
4650
@Expose
4751
public String activityGroupName;
4852

53+
/**
54+
* The Alert Detections.
55+
*
56+
*/
57+
@SerializedName(value = "alertDetections", alternate = {"AlertDetections"})
58+
@Expose
59+
public java.util.List<AlertDetection> alertDetections;
60+
4961
/**
5062
* The Assigned To.
5163
* Name of the analyst the alert is assigned to for triage, investigation, or remediation (supports update).
@@ -182,6 +194,22 @@ public class Alert extends Entity implements IJsonBackedObject {
182194
@Expose
183195
public java.util.List<String> incidentIds;
184196

197+
/**
198+
* The Investigation Security States.
199+
*
200+
*/
201+
@SerializedName(value = "investigationSecurityStates", alternate = {"InvestigationSecurityStates"})
202+
@Expose
203+
public java.util.List<InvestigationSecurityState> investigationSecurityStates;
204+
205+
/**
206+
* The Last Event Date Time.
207+
*
208+
*/
209+
@SerializedName(value = "lastEventDateTime", alternate = {"LastEventDateTime"})
210+
@Expose
211+
public java.util.Calendar lastEventDateTime;
212+
185213
/**
186214
* The Last Modified Date Time.
187215
* Time at which the alert entity 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, 2014 would look like this: '2014-01-01T00:00:00Z'.
@@ -198,6 +226,14 @@ public class Alert extends Entity implements IJsonBackedObject {
198226
@Expose
199227
public java.util.List<MalwareState> malwareStates;
200228

229+
/**
230+
* The Message Security States.
231+
*
232+
*/
233+
@SerializedName(value = "messageSecurityStates", alternate = {"MessageSecurityStates"})
234+
@Expose
235+
public java.util.List<MessageSecurityState> messageSecurityStates;
236+
201237
/**
202238
* The Network Connections.
203239
* Security-related stateful information generated by the provider about the network connection(s) related to this alert.
@@ -286,6 +322,14 @@ public class Alert extends Entity implements IJsonBackedObject {
286322
@Expose
287323
public java.util.List<AlertTrigger> triggers;
288324

325+
/**
326+
* The Uri Click Security States.
327+
*
328+
*/
329+
@SerializedName(value = "uriClickSecurityStates", alternate = {"UriClickSecurityStates"})
330+
@Expose
331+
public java.util.List<UriClickSecurityState> uriClickSecurityStates;
332+
289333
/**
290334
* The User States.
291335
* Security-related stateful information generated by the provider about the user accounts related to this alert.
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
// ------------------------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
3+
// ------------------------------------------------------------------------------
4+
5+
package com.microsoft.graph.models.extensions;
6+
import com.microsoft.graph.serializer.ISerializer;
7+
import com.microsoft.graph.serializer.IJsonBackedObject;
8+
import com.microsoft.graph.serializer.AdditionalDataManager;
9+
import java.util.EnumSet;
10+
11+
12+
import com.google.gson.JsonObject;
13+
import com.google.gson.annotations.SerializedName;
14+
import com.google.gson.annotations.Expose;
15+
16+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
17+
18+
/**
19+
* The class for the Alert Detection.
20+
*/
21+
public class AlertDetection implements IJsonBackedObject {
22+
23+
@SerializedName("@odata.type")
24+
@Expose
25+
public String oDataType;
26+
27+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
28+
29+
@Override
30+
public final AdditionalDataManager additionalDataManager() {
31+
return additionalDataManager;
32+
}
33+
34+
/**
35+
* The Detection Type.
36+
*
37+
*/
38+
@SerializedName(value = "detectionType", alternate = {"DetectionType"})
39+
@Expose
40+
public String detectionType;
41+
42+
/**
43+
* The Method.
44+
*
45+
*/
46+
@SerializedName(value = "method", alternate = {"Method"})
47+
@Expose
48+
public String method;
49+
50+
/**
51+
* The Name.
52+
*
53+
*/
54+
@SerializedName(value = "name", alternate = {"Name"})
55+
@Expose
56+
public String name;
57+
58+
59+
/**
60+
* The raw representation of this class
61+
*/
62+
private JsonObject rawObject;
63+
64+
/**
65+
* The serializer
66+
*/
67+
private ISerializer serializer;
68+
69+
/**
70+
* Gets the raw representation of this class
71+
*
72+
* @return the raw representation of this class
73+
*/
74+
public JsonObject getRawObject() {
75+
return rawObject;
76+
}
77+
78+
/**
79+
* Gets serializer
80+
*
81+
* @return the serializer
82+
*/
83+
protected ISerializer getSerializer() {
84+
return serializer;
85+
}
86+
87+
/**
88+
* Sets the raw JSON object
89+
*
90+
* @param serializer the serializer
91+
* @param json the JSON object to set this object to
92+
*/
93+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
94+
this.serializer = serializer;
95+
rawObject = json;
96+
97+
}
98+
}

src/main/java/com/microsoft/graph/models/extensions/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
220220

221221
/**
222222
* The Sign In Audience.
223-
* Specifies the Microsoft accounts that are supported for the current application. Supported values are:AzureADMyOrg: Users with a Microsoft work or school account in my organization’s Azure AD tenant (single tenant)AzureADMultipleOrgs: Users with a Microsoft work or school account in any organization’s Azure AD tenant (multi-tenant).AzureADandPersonalMicrosoftAccount: Users with a personal Microsoft account, or a work or school account in any organization’s Azure AD tenant.PersonalMicrosoftAccount: Users with a personal Microsoft account only.
223+
* Specifies the Microsoft accounts that are supported for the current application. Supported values are:AzureADMyOrg: Users with a Microsoft work or school account in my organization’s Azure AD tenant (single tenant)AzureADMultipleOrgs: Users with a Microsoft work or school account in any organization’s Azure AD tenant (multi-tenant).AzureADandPersonalMicrosoftAccount: Users with a personal Microsoft account, or a work or school account in any organization’s Azure AD tenant.PersonalMicrosoftAccount: Users with a personal Microsoft account only.For authenticating users with Azure AD B2C user flows, use AzureADandPersonalMicrosoftAccount. This value allows for the widest set of user identities including local accounts and user identities from Microsoft, Facebook, Google, Twitter, or any OpenID Connect provider.
224224
*/
225225
@SerializedName(value = "signInAudience", alternate = {"SignInAudience"})
226226
@Expose

src/main/java/com/microsoft/graph/models/extensions/AssignedPlan.java

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

4242
/**
4343
* The Capability Status.
44-
* For example, 'Enabled'.
44+
* Condition of the capability assignment. The possible values are Enabled, Warning, Suspended, Deleted, LockedOut.
4545
*/
4646
@SerializedName(value = "capabilityStatus", alternate = {"CapabilityStatus"})
4747
@Expose
Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
// ------------------------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
3+
// ------------------------------------------------------------------------------
4+
5+
package com.microsoft.graph.models.extensions;
6+
import com.microsoft.graph.serializer.ISerializer;
7+
import com.microsoft.graph.serializer.IJsonBackedObject;
8+
import com.microsoft.graph.serializer.AdditionalDataManager;
9+
import java.util.EnumSet;
10+
import com.microsoft.graph.models.generated.AllowInvitesFrom;
11+
import com.microsoft.graph.models.extensions.DefaultUserRolePermissions;
12+
import com.microsoft.graph.models.extensions.PolicyBase;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.annotations.SerializedName;
17+
import com.google.gson.annotations.Expose;
18+
19+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
20+
21+
/**
22+
* The class for the Authorization Policy.
23+
*/
24+
public class AuthorizationPolicy extends PolicyBase implements IJsonBackedObject {
25+
26+
27+
/**
28+
* The Allowed To Sign Up Email Based Subscriptions.
29+
* Indicates whether users can sign up for email based subscriptions.
30+
*/
31+
@SerializedName(value = "allowedToSignUpEmailBasedSubscriptions", alternate = {"AllowedToSignUpEmailBasedSubscriptions"})
32+
@Expose
33+
public Boolean allowedToSignUpEmailBasedSubscriptions;
34+
35+
/**
36+
* The Allowed To Use SSPR.
37+
* Indicates whether the Self-Serve Password Reset feature can be used by users on the tenant.
38+
*/
39+
@SerializedName(value = "allowedToUseSSPR", alternate = {"AllowedToUseSSPR"})
40+
@Expose
41+
public Boolean allowedToUseSSPR;
42+
43+
/**
44+
* The Allow Email Verified Users To Join Organization.
45+
* Indicates whether a user can join the tenant by email validation.
46+
*/
47+
@SerializedName(value = "allowEmailVerifiedUsersToJoinOrganization", alternate = {"AllowEmailVerifiedUsersToJoinOrganization"})
48+
@Expose
49+
public Boolean allowEmailVerifiedUsersToJoinOrganization;
50+
51+
/**
52+
* The Allow Invites From.
53+
* Indicates who can invite external users to the organization. Possible values are:none - Prevent everyone, including admins, from inviting external users. Default setting for US Government.adminsAndGuestInviters - Allow members of Global Administrators, User Administrators, and Guest Inviter roles to invite external users.adminsGuestInvitersAndAllMembers - Allow the above admin roles and all other User role members to invite external users.everyone - Allow everyone in the organization, including guest users, to invite external users. Default setting for all cloud environments except US Government.
54+
*/
55+
@SerializedName(value = "allowInvitesFrom", alternate = {"AllowInvitesFrom"})
56+
@Expose
57+
public AllowInvitesFrom allowInvitesFrom;
58+
59+
/**
60+
* The Block Msol Power Shell.
61+
* To disable the use of MSOL PowerShell set this property to true. Setting to true will also disable user-based access to the legacy service endpoint used by MSOL PowerShell. This does not affect Azure AD Connect or Microsoft Graph.
62+
*/
63+
@SerializedName(value = "blockMsolPowerShell", alternate = {"BlockMsolPowerShell"})
64+
@Expose
65+
public Boolean blockMsolPowerShell;
66+
67+
/**
68+
* The Default User Role Permissions.
69+
* Specifies certain customizable permissions for default user role.
70+
*/
71+
@SerializedName(value = "defaultUserRolePermissions", alternate = {"DefaultUserRolePermissions"})
72+
@Expose
73+
public DefaultUserRolePermissions defaultUserRolePermissions;
74+
75+
76+
/**
77+
* The raw representation of this class
78+
*/
79+
private JsonObject rawObject;
80+
81+
/**
82+
* The serializer
83+
*/
84+
private ISerializer serializer;
85+
86+
/**
87+
* Gets the raw representation of this class
88+
*
89+
* @return the raw representation of this class
90+
*/
91+
public JsonObject getRawObject() {
92+
return rawObject;
93+
}
94+
95+
/**
96+
* Gets serializer
97+
*
98+
* @return the serializer
99+
*/
100+
protected ISerializer getSerializer() {
101+
return serializer;
102+
}
103+
104+
/**
105+
* Sets the raw JSON object
106+
*
107+
* @param serializer the serializer
108+
* @param json the JSON object to set this object to
109+
*/
110+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
111+
this.serializer = serializer;
112+
rawObject = json;
113+
114+
}
115+
}

src/main/java/com/microsoft/graph/models/extensions/Channel.java

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

6565
/**
6666
* The Membership Type.
67-
*
67+
* The type of the channel. Can be set during creation and cannot be changed. Possible values are: standard - Channel inherits the list of members of the parent team; private - Channel can have members that are a subset of all the members on the parent team.
6868
*/
6969
@SerializedName(value = "membershipType", alternate = {"MembershipType"})
7070
@Expose
@@ -88,7 +88,7 @@ public class Channel extends Entity implements IJsonBackedObject {
8888

8989
/**
9090
* The Members.
91-
*
91+
* A collection of membership records associated with the channel.
9292
*/
9393
@SerializedName(value = "members", alternate = {"Members"})
9494
@Expose

0 commit comments

Comments
 (0)