Skip to content

Commit

Permalink
Update generated v1.0 Java models and requests with build 4215307
Browse files Browse the repository at this point in the history
  • Loading branch information
Microsoft Graph DevX Tooling authored and Microsoft Graph DevX Tooling committed Dec 8, 2020
1 parent c0a1eea commit 197626c
Show file tree
Hide file tree
Showing 82 changed files with 2,999 additions and 162 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Microsoft Graph SDK for Java
# Microsoft Graph SDK for Java

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

Expand All @@ -19,7 +19,7 @@ repositories {
dependencies {
// Include the sdk as a dependency
implementation 'com.microsoft.graph:microsoft-graph:2.4.1'
implementation 'com.microsoft.graph:microsoft-graph:2.5.0'
}
```

Expand All @@ -31,7 +31,7 @@ Add the dependency in `dependencies` in pom.xml
<dependency>
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph</artifactId>
<version>2.4.1</version>
<version>2.5.0</version>
</dependency>
```

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

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

7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ org.gradle.caching=true

mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 2
mavenMinorVersion = 4
mavenPatchVersion = 1
mavenMajorVersion = 2
mavenMinorVersion = 5
mavenPatchVersion = 0
mavenArtifactSuffix =
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven

Expand All @@ -42,3 +42,4 @@ Password="PASSWORD"
#enable mavenCentralPublishingEnabled to publish to maven central
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
mavenCentralPublishingEnabled=false

3 changes: 2 additions & 1 deletion src/main/java/com/microsoft/graph/core/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ private Constants() {
public static final String PASSWORD = "password";
public static final String TENANTID = "tenantid";
public static final String CLIENTSECRET = "clientsecret";
public static final String VERSION_NAME = "2.4.1";
public static final String VERSION_NAME = "2.5.0";
}

44 changes: 44 additions & 0 deletions src/main/java/com/microsoft/graph/models/extensions/Alert.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,23 @@
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.models.extensions.AlertDetection;
import com.microsoft.graph.models.extensions.CloudAppSecurityState;
import com.microsoft.graph.models.generated.AlertFeedback;
import com.microsoft.graph.models.extensions.FileSecurityState;
import com.microsoft.graph.models.extensions.AlertHistoryState;
import com.microsoft.graph.models.extensions.HostSecurityState;
import com.microsoft.graph.models.extensions.InvestigationSecurityState;
import com.microsoft.graph.models.extensions.MalwareState;
import com.microsoft.graph.models.extensions.MessageSecurityState;
import com.microsoft.graph.models.extensions.NetworkConnection;
import com.microsoft.graph.models.extensions.Process;
import com.microsoft.graph.models.extensions.RegistryKeyState;
import com.microsoft.graph.models.extensions.SecurityResource;
import com.microsoft.graph.models.generated.AlertSeverity;
import com.microsoft.graph.models.generated.AlertStatus;
import com.microsoft.graph.models.extensions.AlertTrigger;
import com.microsoft.graph.models.extensions.UriClickSecurityState;
import com.microsoft.graph.models.extensions.UserSecurityState;
import com.microsoft.graph.models.extensions.SecurityVendorInformation;
import com.microsoft.graph.models.extensions.VulnerabilityState;
Expand All @@ -46,6 +50,14 @@ public class Alert extends Entity implements IJsonBackedObject {
@Expose
public String activityGroupName;

/**
* The Alert Detections.
*
*/
@SerializedName(value = "alertDetections", alternate = {"AlertDetections"})
@Expose
public java.util.List<AlertDetection> alertDetections;

/**
* The Assigned To.
* Name of the analyst the alert is assigned to for triage, investigation, or remediation (supports update).
Expand Down Expand Up @@ -182,6 +194,22 @@ public class Alert extends Entity implements IJsonBackedObject {
@Expose
public java.util.List<String> incidentIds;

/**
* The Investigation Security States.
*
*/
@SerializedName(value = "investigationSecurityStates", alternate = {"InvestigationSecurityStates"})
@Expose
public java.util.List<InvestigationSecurityState> investigationSecurityStates;

/**
* The Last Event Date Time.
*
*/
@SerializedName(value = "lastEventDateTime", alternate = {"LastEventDateTime"})
@Expose
public java.util.Calendar lastEventDateTime;

/**
* The Last Modified Date Time.
* 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'.
Expand All @@ -198,6 +226,14 @@ public class Alert extends Entity implements IJsonBackedObject {
@Expose
public java.util.List<MalwareState> malwareStates;

/**
* The Message Security States.
*
*/
@SerializedName(value = "messageSecurityStates", alternate = {"MessageSecurityStates"})
@Expose
public java.util.List<MessageSecurityState> messageSecurityStates;

/**
* The Network Connections.
* Security-related stateful information generated by the provider about the network connection(s) related to this alert.
Expand Down Expand Up @@ -286,6 +322,14 @@ public class Alert extends Entity implements IJsonBackedObject {
@Expose
public java.util.List<AlertTrigger> triggers;

/**
* The Uri Click Security States.
*
*/
@SerializedName(value = "uriClickSecurityStates", alternate = {"UriClickSecurityStates"})
@Expose
public java.util.List<UriClickSecurityState> uriClickSecurityStates;

/**
* The User States.
* Security-related stateful information generated by the provider about the user accounts related to this alert.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
// ------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
// ------------------------------------------------------------------------------

package com.microsoft.graph.models.extensions;
import com.microsoft.graph.serializer.ISerializer;
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;

// **NOTE** This file was generated by a tool and any changes will be overwritten.

/**
* The class for the Alert Detection.
*/
public class AlertDetection implements IJsonBackedObject {

@SerializedName("@odata.type")
@Expose
public String oDataType;

private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);

@Override
public final AdditionalDataManager additionalDataManager() {
return additionalDataManager;
}

/**
* The Detection Type.
*
*/
@SerializedName(value = "detectionType", alternate = {"DetectionType"})
@Expose
public String detectionType;

/**
* The Method.
*
*/
@SerializedName(value = "method", alternate = {"Method"})
@Expose
public String method;

/**
* The Name.
*
*/
@SerializedName(value = "name", alternate = {"Name"})
@Expose
public String name;


/**
* The raw representation of this class
*/
private JsonObject rawObject;

/**
* The serializer
*/
private ISerializer serializer;

/**
* Gets the raw representation of this class
*
* @return the raw representation of this class
*/
public JsonObject getRawObject() {
return rawObject;
}

/**
* Gets serializer
*
* @return the serializer
*/
protected ISerializer getSerializer() {
return serializer;
}

/**
* Sets the raw JSON object
*
* @param serializer the serializer
* @param json the JSON object to set this object to
*/
public void setRawObject(final ISerializer serializer, final JsonObject json) {
this.serializer = serializer;
rawObject = json;

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {

/**
* The Sign In Audience.
* 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.
* 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.
*/
@SerializedName(value = "signInAudience", alternate = {"SignInAudience"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Capability Status.
* For example, 'Enabled'.
* Condition of the capability assignment. The possible values are Enabled, Warning, Suspended, Deleted, LockedOut.
*/
@SerializedName(value = "capabilityStatus", alternate = {"CapabilityStatus"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
// ------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
// ------------------------------------------------------------------------------

package com.microsoft.graph.models.extensions;
import com.microsoft.graph.serializer.ISerializer;
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.models.generated.AllowInvitesFrom;
import com.microsoft.graph.models.extensions.DefaultUserRolePermissions;
import com.microsoft.graph.models.extensions.PolicyBase;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;

// **NOTE** This file was generated by a tool and any changes will be overwritten.

/**
* The class for the Authorization Policy.
*/
public class AuthorizationPolicy extends PolicyBase implements IJsonBackedObject {


/**
* The Allowed To Sign Up Email Based Subscriptions.
* Indicates whether users can sign up for email based subscriptions.
*/
@SerializedName(value = "allowedToSignUpEmailBasedSubscriptions", alternate = {"AllowedToSignUpEmailBasedSubscriptions"})
@Expose
public Boolean allowedToSignUpEmailBasedSubscriptions;

/**
* The Allowed To Use SSPR.
* Indicates whether the Self-Serve Password Reset feature can be used by users on the tenant.
*/
@SerializedName(value = "allowedToUseSSPR", alternate = {"AllowedToUseSSPR"})
@Expose
public Boolean allowedToUseSSPR;

/**
* The Allow Email Verified Users To Join Organization.
* Indicates whether a user can join the tenant by email validation.
*/
@SerializedName(value = "allowEmailVerifiedUsersToJoinOrganization", alternate = {"AllowEmailVerifiedUsersToJoinOrganization"})
@Expose
public Boolean allowEmailVerifiedUsersToJoinOrganization;

/**
* The Allow Invites From.
* 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.
*/
@SerializedName(value = "allowInvitesFrom", alternate = {"AllowInvitesFrom"})
@Expose
public AllowInvitesFrom allowInvitesFrom;

/**
* The Block Msol Power Shell.
* 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.
*/
@SerializedName(value = "blockMsolPowerShell", alternate = {"BlockMsolPowerShell"})
@Expose
public Boolean blockMsolPowerShell;

/**
* The Default User Role Permissions.
* Specifies certain customizable permissions for default user role.
*/
@SerializedName(value = "defaultUserRolePermissions", alternate = {"DefaultUserRolePermissions"})
@Expose
public DefaultUserRolePermissions defaultUserRolePermissions;


/**
* The raw representation of this class
*/
private JsonObject rawObject;

/**
* The serializer
*/
private ISerializer serializer;

/**
* Gets the raw representation of this class
*
* @return the raw representation of this class
*/
public JsonObject getRawObject() {
return rawObject;
}

/**
* Gets serializer
*
* @return the serializer
*/
protected ISerializer getSerializer() {
return serializer;
}

/**
* Sets the raw JSON object
*
* @param serializer the serializer
* @param json the JSON object to set this object to
*/
public void setRawObject(final ISerializer serializer, final JsonObject json) {
this.serializer = serializer;
rawObject = json;

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class Channel extends Entity implements IJsonBackedObject {

/**
* The Membership Type.
*
* 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.
*/
@SerializedName(value = "membershipType", alternate = {"MembershipType"})
@Expose
Expand All @@ -88,7 +88,7 @@ public class Channel extends Entity implements IJsonBackedObject {

/**
* The Members.
*
* A collection of membership records associated with the channel.
*/
@SerializedName(value = "members", alternate = {"Members"})
@Expose
Expand Down

0 comments on commit 197626c

Please sign in to comment.