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
4 changes: 2 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:2.3.+'
implementation 'com.microsoft.graph:microsoft-graph:2.4.+'
}
```

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.3.2</version>
<version>2.4.0</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ org.gradle.caching=true
mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 2
mavenMinorVersion = 3
mavenPatchVersion = 2
mavenMinorVersion = 4
mavenPatchVersion = 0
mavenArtifactSuffix =
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven

Expand Down
2 changes: 1 addition & 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,5 @@ 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.3.2";
public static final String VERSION_NAME = "2.4.0";
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ public class Channel extends Entity implements IJsonBackedObject {
@Expose
public String email;

/**
* The Is Favorite By Default.
* Indicates whether the channel should automatically be marked 'favorite' for all members of the team. Can only be set programmatically with Create team. Default: false.
*/
@SerializedName(value = "isFavoriteByDefault", alternate = {"IsFavoriteByDefault"})
@Expose
public Boolean isFavoriteByDefault;

/**
* The Membership Type.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class DirectoryAudit extends Entity implements IJsonBackedObject {

/**
* The Result.
* Indicates the result of the activity.Possible values are: success, failure, timeout, unknownFutureValue.
* Indicates the result of the activity. Possible values are: success, failure, timeout, unknownFutureValue.
*/
@SerializedName(value = "result", alternate = {"Result"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public class Event extends OutlookItem implements IJsonBackedObject {

/**
* The Web Link.
* The URL to open the event in Outlook on the web.Outlook on the web opens the event in the browser if you are signed in to your mailbox. Otherwise, Outlook on the web prompts you to sign in.This URL can be accessed from within an iFrame.
* The URL to open the event in Outlook on the web.Outlook on the web opens the event in the browser if you are signed in to your mailbox. Otherwise, Outlook on the web prompts you to sign in.This URL cannot be accessed from within an iFrame.
*/
@SerializedName(value = "webLink", alternate = {"WebLink"})
@Expose
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/com/microsoft/graph/models/extensions/Group.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.microsoft.graph.models.extensions.OnPremisesProvisioningError;
import com.microsoft.graph.models.extensions.AppRoleAssignment;
import com.microsoft.graph.models.extensions.DirectoryObject;
import com.microsoft.graph.models.extensions.ResourceSpecificPermissionGrant;
import com.microsoft.graph.models.extensions.GroupSetting;
import com.microsoft.graph.models.extensions.Calendar;
import com.microsoft.graph.models.extensions.Event;
Expand All @@ -28,6 +29,7 @@
import com.microsoft.graph.models.extensions.Team;
import com.microsoft.graph.requests.extensions.AppRoleAssignmentCollectionPage;
import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionPage;
import com.microsoft.graph.requests.extensions.ResourceSpecificPermissionGrantCollectionPage;
import com.microsoft.graph.requests.extensions.GroupSettingCollectionPage;
import com.microsoft.graph.requests.extensions.EventCollectionPage;
import com.microsoft.graph.requests.extensions.ConversationCollectionPage;
Expand Down Expand Up @@ -387,6 +389,14 @@ public class Group extends DirectoryObject implements IJsonBackedObject {
*/
public DirectoryObjectCollectionPage owners;

/**
* The Permission Grants.
*
*/
@SerializedName(value = "permissionGrants", alternate = {"PermissionGrants"})
@Expose
public ResourceSpecificPermissionGrantCollectionPage permissionGrants;

/**
* The Settings.
* Read-only. Nullable.
Expand Down Expand Up @@ -603,6 +613,10 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
owners = serializer.deserializeObject(json.get("owners").toString(), DirectoryObjectCollectionPage.class);
}

if (json.has("permissionGrants")) {
permissionGrants = serializer.deserializeObject(json.get("permissionGrants").toString(), ResourceSpecificPermissionGrantCollectionPage.class);
}

if (json.has("settings")) {
settings = serializer.deserializeObject(json.get("settings").toString(), GroupSettingCollectionPage.class);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import com.microsoft.graph.requests.extensions.IOAuth2PermissionGrantRequestBuilder;
import com.microsoft.graph.requests.extensions.IOrganizationCollectionRequestBuilder;
import com.microsoft.graph.requests.extensions.IOrganizationRequestBuilder;
import com.microsoft.graph.requests.extensions.IResourceSpecificPermissionGrantCollectionRequestBuilder;
import com.microsoft.graph.requests.extensions.IResourceSpecificPermissionGrantRequestBuilder;
import com.microsoft.graph.requests.extensions.IScopedRoleMembershipCollectionRequestBuilder;
import com.microsoft.graph.requests.extensions.IScopedRoleMembershipRequestBuilder;
import com.microsoft.graph.requests.extensions.IServicePrincipalCollectionRequestBuilder;
Expand Down Expand Up @@ -82,6 +84,7 @@
import com.microsoft.graph.requests.extensions.IDeviceAppManagementRequestBuilder;
import com.microsoft.graph.requests.extensions.IDeviceManagementRequestBuilder;
import com.microsoft.graph.requests.extensions.IReportRootRequestBuilder;
import com.microsoft.graph.requests.extensions.ISearchEntityRequestBuilder;
import com.microsoft.graph.requests.extensions.IPlannerRequestBuilder;
import com.microsoft.graph.requests.extensions.ISecurityRequestBuilder;
import com.microsoft.graph.requests.extensions.IAppCatalogsRequestBuilder;
Expand Down Expand Up @@ -368,6 +371,21 @@ public interface IBaseGraphServiceClient extends IBaseClient {
*/
IOrganizationRequestBuilder organization(final String id);

/**
* Gets the collection of PermissionGrants objects
*
* @return the request builder for the collection of PermissionGrants objects
*/
IResourceSpecificPermissionGrantCollectionRequestBuilder permissionGrants();

/**
* Gets a single PermissionGrants
*
* @param id the id of the PermissionGrants to retrieve
* @return the request builder for the PermissionGrants object
*/
IResourceSpecificPermissionGrantRequestBuilder permissionGrants(final String id);

/**
* Gets the collection of ScopedRoleMemberships objects
*
Expand Down Expand Up @@ -670,6 +688,13 @@ public interface IBaseGraphServiceClient extends IBaseClient {
*/
IReportRootRequestBuilder reports();

/**
* Gets the GraphServiceRequestBuilder
*
* @return the SearchEntity
*/
ISearchEntityRequestBuilder search();

/**
* Gets the GraphServiceRequestBuilder
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import com.microsoft.graph.requests.extensions.IOAuth2PermissionGrantRequestBuilder;
import com.microsoft.graph.requests.extensions.IOrganizationCollectionRequestBuilder;
import com.microsoft.graph.requests.extensions.IOrganizationRequestBuilder;
import com.microsoft.graph.requests.extensions.IResourceSpecificPermissionGrantCollectionRequestBuilder;
import com.microsoft.graph.requests.extensions.IResourceSpecificPermissionGrantRequestBuilder;
import com.microsoft.graph.requests.extensions.IScopedRoleMembershipCollectionRequestBuilder;
import com.microsoft.graph.requests.extensions.IScopedRoleMembershipRequestBuilder;
import com.microsoft.graph.requests.extensions.IServicePrincipalCollectionRequestBuilder;
Expand Down Expand Up @@ -82,6 +84,7 @@
import com.microsoft.graph.requests.extensions.IDeviceAppManagementRequestBuilder;
import com.microsoft.graph.requests.extensions.IDeviceManagementRequestBuilder;
import com.microsoft.graph.requests.extensions.IReportRootRequestBuilder;
import com.microsoft.graph.requests.extensions.ISearchEntityRequestBuilder;
import com.microsoft.graph.requests.extensions.IPlannerRequestBuilder;
import com.microsoft.graph.requests.extensions.ISecurityRequestBuilder;
import com.microsoft.graph.requests.extensions.IAppCatalogsRequestBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
// ------------------------------------------------------------------------------
// 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.extensions.ResourcePermission;


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 Instance Resource Access.
*/
public class InstanceResourceAccess implements IJsonBackedObject {

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

private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);

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

/**
* The Permissions.
*
*/
@SerializedName(value = "permissions", alternate = {"Permissions"})
@Expose
public java.util.List<ResourcePermission> permissions;

/**
* The Resource App Id.
*
*/
@SerializedName(value = "resourceAppId", alternate = {"ResourceAppId"})
@Expose
public String resourceAppId;


/**
* 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 @@ -57,7 +57,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Key.
* Value for the key credential. Should be a base 64 encoded value.
* The certificate's raw data in byte array converted to Base64 string; for example, [System.Convert]::ToBase64String($Cert.GetRawCertData()).
*/
@SerializedName(value = "key", alternate = {"Key"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ public class LinkedResource extends Entity implements IJsonBackedObject {

/**
* The Application Name.
*
* Field indicating the app name of the source that is sending the linkedResource.
*/
@SerializedName(value = "applicationName", alternate = {"ApplicationName"})
@Expose
public String applicationName;

/**
* The Display Name.
*
* Field indicating the title of the linkedResource.
*/
@SerializedName(value = "displayName", alternate = {"DisplayName"})
@Expose
public String displayName;

/**
* The External Id.
*
* Id of the object that is associated with this task on the third-party/partner system.
*/
@SerializedName(value = "externalId", alternate = {"ExternalId"})
@Expose
public String externalId;

/**
* The Web Url.
*
* Deep link to the linkedResource.
*/
@SerializedName(value = "webUrl", alternate = {"WebUrl"})
@Expose
Expand Down
Loading