Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Allowed Member Types.
* Specifies whether this app role can be assigned to users and groups (by setting to ['User']), to other application's (by setting to ['Application'], or both (by setting to ['User', 'Application']). App roles supporting assignment of other applications' service principals are also known as application permissions.
* Specifies whether this app role can be assigned to users and groups (by setting to ['User']), to other application's (by setting to ['Application'], or both (by setting to ['User', 'Application']). App roles supporting assignment to other applications' service principals are also known as application permissions. The 'Application' value is only supported for app roles defined on application entities.
*/
@SerializedName(value = "allowedMemberTypes", alternate = {"AllowedMemberTypes"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ public class Calendar extends Entity implements IJsonBackedObject {
@Expose
public OnlineMeetingProviderType defaultOnlineMeetingProvider;

/**
* The Hex Color.
*
*/
@SerializedName(value = "hexColor", alternate = {"HexColor"})
@Expose
public String hexColor;

/**
* The Is Removable.
* Indicates whether this user calendar can be deleted from the user mailbox.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class Channel extends Entity implements IJsonBackedObject {

/**
* The Web Url.
* A hyperlink that will navigate to the channel in Microsoft Teams. This is the URL that you get when you right-click a channel in Microsoft Teams and select Get link to channel. This URL should be treated as an opaque blob, and not parsed. Read-only.
* A hyperlink that will go to the channel in Microsoft Teams. This is the URL that you get when you right-click a channel in Microsoft Teams and select Get link to channel. This URL should be treated as an opaque blob, and not parsed. Read-only.
*/
@SerializedName(value = "webUrl", alternate = {"WebUrl"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public class ChatMessage extends Entity implements IJsonBackedObject {

/**
* The Policy Violation.
*
* Defines the properties of a policy violation set by a data loss prevention (DLP) application.
*/
@SerializedName(value = "policyViolation", alternate = {"PolicyViolation"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,39 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Dlp Action.
*
* The action taken by the DLP provider on the message with sensitive content. Supported values are: NoneNotifySender -- Inform the sender of the violation but allow readers to read the message.BlockAccess -- Block readers from reading the message.BlockAccessExternal -- Block users outside the organization from reading the message, while allowing users within the organization to read the message.
*/
@SerializedName(value = "dlpAction", alternate = {"DlpAction"})
@Expose
public EnumSet<ChatMessagePolicyViolationDlpActionTypes> dlpAction;

/**
* The Justification Text.
*
* Justification text provided by the sender of the message when overriding a policy violation.
*/
@SerializedName(value = "justificationText", alternate = {"JustificationText"})
@Expose
public String justificationText;

/**
* The Policy Tip.
*
* Information to display to the message sender about why the message was flagged as a violation.
*/
@SerializedName(value = "policyTip", alternate = {"PolicyTip"})
@Expose
public ChatMessagePolicyViolationPolicyTip policyTip;

/**
* The User Action.
*
* Indicates the action taken by the user on a message blocked by the DLP provider. Supported values are: NoneOverrideReportFalsePositiveWhen the DLP provider is updating the message for blocking sensitive content, userAction is not required.
*/
@SerializedName(value = "userAction", alternate = {"UserAction"})
@Expose
public EnumSet<ChatMessagePolicyViolationUserActionTypes> userAction;

/**
* The Verdict Details.
*
* Indicates what actions the sender may take in response to the policy violation. Supported values are: NoneAllowFalsePositiveOverride -- Allows the sender to declare the policyViolation to be an error in the DLP app and its rules, and allow readers to see the message again if the dlpAction had hidden it.AllowOverrideWithoutJustification -- Allows the sender to overriide the DLP violation and allow readers to see the message again if the dlpAction had hidden it, without needing to provide an explanation for doing so. AllowOverrideWithJustification -- Allows the sender to overriide the DLP violation and allow readers to see the message again if the dlpAction had hidden it, after providing an explanation for doing so.AllowOverrideWithoutJustification and AllowOverrideWithJustification are mutually exclusive.
*/
@SerializedName(value = "verdictDetails", alternate = {"VerdictDetails"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Compliance Url.
*
* The URL a user can visit to read about the data loss prevention policies for the organization. (ie, policies about what users shouldn't say in chats)
*/
@SerializedName(value = "complianceUrl", alternate = {"ComplianceUrl"})
@Expose
public String complianceUrl;

/**
* The General Text.
*
* Explanatory text shown to the sender of the message.
*/
@SerializedName(value = "generalText", alternate = {"GeneralText"})
@Expose
public String generalText;

/**
* The Matched Condition Descriptions.
*
* The list of improper data in the message that was detected by the data loss prevention app. Each DLP app defines its own conditions, examples include 'Credit Card Number' and 'Social Security Number'.
*/
@SerializedName(value = "matchedConditionDescriptions", alternate = {"MatchedConditionDescriptions"})
@Expose
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/com/microsoft/graph/models/extensions/Event.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class Event extends OutlookItem implements IJsonBackedObject {

/**
* The ICal UId.
* A unique identifier that is shared by all instances of an event across different calendars. Read-only.
* A unique identifier for an event across calendars. This ID is different for each occurrence in a recurring series. Read-only.
*/
@SerializedName(value = "iCalUId", alternate = {"ICalUId"})
@Expose
Expand Down Expand Up @@ -126,6 +126,14 @@ public class Event extends OutlookItem implements IJsonBackedObject {
@Expose
public Boolean isCancelled;

/**
* The Is Draft.
*
*/
@SerializedName(value = "isDraft", alternate = {"IsDraft"})
@Expose
public Boolean isDraft;

/**
* The Is Online Meeting.
* True if this event has online meeting information, false otherwise. Default is false. Optional.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// ------------------------------------------------------------------------------
// 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.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.google.gson.JsonObject;
import com.microsoft.graph.serializer.ISerializer;
import java.util.EnumSet;

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

/**
* The class for the Event Cancel Body.
*/
public class EventCancelBody {

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


/**
* 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
@@ -0,0 +1,77 @@
// ------------------------------------------------------------------------------
// 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.models.extensions.Recipient;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.google.gson.JsonObject;
import com.microsoft.graph.serializer.ISerializer;
import java.util.EnumSet;

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

/**
* The class for the Event Forward Body.
*/
public class EventForwardBody {

/**
* The to Recipients.
*
*/
@SerializedName(value = "toRecipients", alternate = {"ToRecipients"})
@Expose
public java.util.List<Recipient> toRecipients;

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


/**
* 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 @@ -149,7 +149,7 @@ public class Group extends DirectoryObject implements IJsonBackedObject {

/**
* The Mail Nickname.
* The mail alias for the group, unique in the organization. This property must be specified when a group is created. Returned by default. Supports $filter.
* The mail alias for the group, unique in the organization. This property must be specified when a group is created. These characters cannot be used in the mailNickName: @()/[]';:.&amp;lt;&amp;gt;,SPACE. Returned by default. Supports $filter.
*/
@SerializedName(value = "mailNickname", alternate = {"MailNickname"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class Subscription extends Entity implements IJsonBackedObject {

/**
* The Latest Supported Tls Version.
*
* Specifies the latest version of Transport Layer Security (TLS) that the notification endpoint, specified by notificationUrl, supports. The possible values are: v1_0, v1_1, v1_2, v1_3. For subscribers whose notification endpoint supports a version lower than the currently recommended version (TLS 1.2), specifying this property by a set timeline allows them to temporarily use their deprecated version of TLS before completing their upgrade to TLS 1.2. For these subscribers, not setting this property per the timeline would result in subscription operations failing. For subscribers whose notification endpoint already supports TLS 1.2, setting this property is optional. In such cases, Microsoft Graph defaults the property to v1_2.
*/
@SerializedName(value = "latestSupportedTlsVersion", alternate = {"LatestSupportedTlsVersion"})
@Expose
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/microsoft/graph/models/extensions/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import com.microsoft.graph.models.extensions.UserActivity;
import com.microsoft.graph.models.extensions.OnlineMeeting;
import com.microsoft.graph.models.extensions.Team;
import com.microsoft.graph.models.extensions.UserTeamwork;
import com.microsoft.graph.requests.extensions.AppRoleAssignmentCollectionPage;
import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionPage;
import com.microsoft.graph.requests.extensions.LicenseDetailsCollectionPage;
Expand Down Expand Up @@ -910,6 +911,14 @@ public class User extends DirectoryObject implements IJsonBackedObject {
@Expose
public TeamCollectionPage joinedTeams;

/**
* The Teamwork.
*
*/
@SerializedName(value = "teamwork", alternate = {"Teamwork"})
@Expose
public UserTeamwork teamwork;


/**
* The raw representation of this class
Expand Down
Loading