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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {

dependencies {
// Include the sdk as a dependency
implementation 'com.microsoft.graph:microsoft-graph:4.1.0'
implementation 'com.microsoft.graph:microsoft-graph:4.2.0'
// Uncomment the line below if you are building an android application
//implementation 'com.google.guava:guava:30.1.1-android'
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
Expand All @@ -36,7 +36,7 @@ Add the dependency in `dependencies` in pom.xml
<!-- Include the sdk as a dependency -->
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph</artifactId>
<version>4.1.0</version>
<version>4.2.0</version>
</dependency>
<dependency>
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
Expand Down Expand Up @@ -146,3 +146,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI




3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ org.gradle.caching=true
mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 4
mavenMinorVersion = 1
mavenMinorVersion = 2
mavenPatchVersion = 0
mavenArtifactSuffix =

Expand Down Expand Up @@ -55,3 +55,4 @@ mavenCentralPublishingEnabled=false




Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Labels.
* Specifies one or more well-known tags added against a property. Labels help Microsoft Search understand the semantics of the data in the connection. Adding appropriate labels would result in an enhanced search experience (e.g. better relevance). Supported labels: title, url, createdBy, lastModifiedBy, authors, createdDateTime, lastModifiedDateTime, fileName, fileExtension, iconUrl, containerName, and containerUrl. Optional.
* Specifies one or more well-known tags added against a property. Labels help Microsoft Search understand the semantics of the data in the connection. Adding appropriate labels would result in an enhanced search experience (e.g. better relevance). Optional.The possible values are: title, url, createdBy, lastModifiedBy, authors, createdDateTime, lastModifiedDateTime, fileName, fileExtension, unknownFutureValue, iconUrl, containerName, containerUrl. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: iconUrl, containerName, containerUrl.
*/
@SerializedName(value = "labels", alternate = {"Labels"})
@Expose
Expand All @@ -105,7 +105,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Type.
* The data type of the property. Possible values are: string, int64, double, dateTime, boolean, stringCollection, int64Collection, doubleCollection, dateTimeCollection. Required.
* The data type of the property. Possible values are: string, int64, double, dateTime, boolean, stringCollection, int64Collection, doubleCollection, dateTimeCollection, unknownFutureValue. Required.
*/
@SerializedName(value = "type", alternate = {"Type"})
@Expose
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/microsoft/graph/info/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ private Constants() {
/** The client secret to use for unit testing */
public static final String CLIENTSECRET = "clientsecret";
/** The SDK version */
public static final String VERSION_NAME = "4.1.0";
public static final String VERSION_NAME = "4.2.0";
}


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




60 changes: 60 additions & 0 deletions src/main/java/com/microsoft/graph/models/Admin.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// 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;
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.ServiceAnnouncement;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

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

/**
* The class for the Admin.
*/
public class Admin implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
public String oDataType;

private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);

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

/**
* The Service Announcement.
*
*/
@SerializedName(value = "serviceAnnouncement", alternate = {"ServiceAnnouncement"})
@Expose
@Nullable
public ServiceAnnouncement serviceAnnouncement;


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

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Result.
* Indicates the result of the CA policy that was triggered. Possible values are: success, failure, notApplied (Policy isn't applied because policy conditions were not met),notEnabled (This is due to the policy in disabled state), unknown, unknownFutureValue, reportOnlySuccess, reportOnlyFailure, reportOnlyNotApplied, reportOnlyInterrupted
* Indicates the result of the CA policy that was triggered. Possible values are: success, failure, notApplied (Policy isn't applied because policy conditions were not met),notEnabled (This is due to the policy in disabled state), unknown, unknownFutureValue, reportOnlySuccess, reportOnlyFailure, reportOnlyNotApplied, reportOnlyInterrupted. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: reportOnlySuccess, reportOnlyFailure, reportOnlyNotApplied, reportOnlyInterrupted.
*/
@SerializedName(value = "result", alternate = {"Result"})
@Expose
Expand Down
54 changes: 54 additions & 0 deletions src/main/java/com/microsoft/graph/models/Bitlocker.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// 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;
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.http.BaseCollectionPage;
import com.microsoft.graph.models.BitlockerRecoveryKey;
import com.microsoft.graph.models.Entity;
import com.microsoft.graph.requests.BitlockerRecoveryKeyCollectionPage;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

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

/**
* The class for the Bitlocker.
*/
public class Bitlocker extends Entity implements IJsonBackedObject {


/**
* The Recovery Keys.
* The recovery keys associated with the bitlocker entity.
*/
@SerializedName(value = "recoveryKeys", alternate = {"RecoveryKeys"})
@Expose
@Nullable
public BitlockerRecoveryKeyCollectionPage recoveryKeys;


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


if (json.has("recoveryKeys")) {
recoveryKeys = serializer.deserializeObject(json.get("recoveryKeys"), BitlockerRecoveryKeyCollectionPage.class);
}
}
}
75 changes: 75 additions & 0 deletions src/main/java/com/microsoft/graph/models/BitlockerRecoveryKey.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// 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;
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.VolumeType;
import com.microsoft.graph.models.Entity;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

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

/**
* The class for the Bitlocker Recovery Key.
*/
public class BitlockerRecoveryKey extends Entity implements IJsonBackedObject {


/**
* The Created Date Time.
* The date and time when the key was originally backed up to Azure Active Directory.
*/
@SerializedName(value = "createdDateTime", alternate = {"CreatedDateTime"})
@Expose
@Nullable
public java.time.OffsetDateTime createdDateTime;

/**
* The Device Id.
* ID of the device the BitLocker key is originally backed up from.
*/
@SerializedName(value = "deviceId", alternate = {"DeviceId"})
@Expose
@Nullable
public String deviceId;

/**
* The Key.
* The BitLocker recovery key.
*/
@SerializedName(value = "key", alternate = {"Key"})
@Expose
@Nullable
public String key;

/**
* The Volume Type.
* Indicates the type of volume the BitLocker key is associated with. Possible values are: operatingSystemVolume, fixedDataVolume, removableDataVolume, unknownFutureValue.
*/
@SerializedName(value = "volumeType", alternate = {"VolumeType"})
@Expose
@Nullable
public VolumeType volumeType;


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

}
}
2 changes: 1 addition & 1 deletion src/main/java/com/microsoft/graph/models/Channel.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public class Channel extends Entity implements IJsonBackedObject {

/**
* The Membership Type.
* The type of the channel. Can be set during creation and can't be changed. Default: standard.
* The type of the channel. Can be set during creation and can't be changed. The possible values are: standard, private, unknownFutureValue, shared. The default value is standard. Note that you must use the Prefer: include-unknown-enum-members request header to get the following value in this evolvable enum: shared.
*/
@SerializedName(value = "membershipType", alternate = {"MembershipType"})
@Expose
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/microsoft/graph/models/ChatMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public class ChatMessage extends Entity implements IJsonBackedObject {

/**
* The Message Type.
* The type of chat message. The possible values are: message, unknownFutureValue, systemEventMessage.
* The type of chat message. The possible values are: message, chatEvent, typing, unknownFutureValue, systemEventMessage. Note that you must use the Prefer: include-unknown-enum-members request header to get the following value in this evolvable enum: systemEventMessage.
*/
@SerializedName(value = "messageType", alternate = {"MessageType"})
@Expose
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/microsoft/graph/models/ConversationThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ConversationThread extends Entity implements IJsonBackedObject {

/**
* The Cc Recipients.
* The Cc: recipients for the thread.
* The Cc: recipients for the thread. Returned only on $select.
*/
@SerializedName(value = "ccRecipients", alternate = {"CcRecipients"})
@Expose
Expand All @@ -40,7 +40,7 @@ public class ConversationThread extends Entity implements IJsonBackedObject {

/**
* The Has Attachments.
* Indicates whether any of the posts within this thread has at least one attachment.
* Indicates whether any of the posts within this thread has at least one attachment. Returned by default.
*/
@SerializedName(value = "hasAttachments", alternate = {"HasAttachments"})
@Expose
Expand All @@ -49,7 +49,7 @@ public class ConversationThread extends Entity implements IJsonBackedObject {

/**
* The Is Locked.
* Indicates if the thread is locked.
* Indicates if the thread is locked. Returned by default.
*/
@SerializedName(value = "isLocked", alternate = {"IsLocked"})
@Expose
Expand All @@ -58,7 +58,7 @@ public class ConversationThread extends Entity implements IJsonBackedObject {

/**
* The Last Delivered Date Time.
* 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 is 2014-01-01T00:00:00Z
* 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 is 2014-01-01T00:00:00Z. Returned by default.
*/
@SerializedName(value = "lastDeliveredDateTime", alternate = {"LastDeliveredDateTime"})
@Expose
Expand All @@ -67,7 +67,7 @@ public class ConversationThread extends Entity implements IJsonBackedObject {

/**
* The Preview.
* A short summary from the body of the latest post in this conversation.
* A short summary from the body of the latest post in this conversation. Returned by default.
*/
@SerializedName(value = "preview", alternate = {"Preview"})
@Expose
Expand All @@ -76,7 +76,7 @@ public class ConversationThread extends Entity implements IJsonBackedObject {

/**
* The Topic.
* The topic of the conversation. This property can be set when the conversation is created, but it cannot be updated.
* The topic of the conversation. This property can be set when the conversation is created, but it cannot be updated. Returned by default.
*/
@SerializedName(value = "topic", alternate = {"Topic"})
@Expose
Expand All @@ -85,7 +85,7 @@ public class ConversationThread extends Entity implements IJsonBackedObject {

/**
* The To Recipients.
* The To: recipients for the thread.
* The To: recipients for the thread. Returned only on $select.
*/
@SerializedName(value = "toRecipients", alternate = {"ToRecipients"})
@Expose
Expand All @@ -94,7 +94,7 @@ public class ConversationThread extends Entity implements IJsonBackedObject {

/**
* The Unique Senders.
* All the users that sent a message to this thread.
* All the users that sent a message to this thread. Returned by default.
*/
@SerializedName(value = "uniqueSenders", alternate = {"UniqueSenders"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.http.BaseCollectionPage;
import com.microsoft.graph.models.Bitlocker;
import com.microsoft.graph.models.ThreatAssessmentRequest;
import com.microsoft.graph.models.Entity;
import com.microsoft.graph.requests.ThreatAssessmentRequestCollectionPage;
Expand All @@ -28,6 +29,15 @@
public class InformationProtection extends Entity implements IJsonBackedObject {


/**
* The Bitlocker.
*
*/
@SerializedName(value = "bitlocker", alternate = {"Bitlocker"})
@Expose
@Nullable
public Bitlocker bitlocker;

/**
* The Threat Assessment Requests.
*
Expand Down
Loading