Skip to content

Commit

Permalink
Merge pull request #1515 from microsoftgraph/v1.0/pipelinebuild/121145
Browse files Browse the repository at this point in the history
Generated  models and request builders
  • Loading branch information
ramsessanchez authored Jul 28, 2023
2 parents 9afd4b7 + 2033a1d commit 34bb276
Show file tree
Hide file tree
Showing 36 changed files with 1,698 additions and 33 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

## [5.66.0] - 2023-07-28

### Added

- Added TeamsAppSettings model and requests.
- Several Evidence models added to the Security namespace. This includes but is not limited to:
- BlobEvidence.
- ContainerEvidence.
- ContainerRegistryEvidence.
- KubernetesClusterEvidence.
- ContainerPortProtocol model.
- Dictionary model.
- FileHashAlgorithm model.
- FileHash model.

## [5.65.0] - 2023-07-20

### Added
Expand Down
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:5.65.0'
implementation 'com.microsoft.graph:microsoft-graph:5.66.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>5.65.0</version>
<version>5.66.0</version>
</dependency>
<dependency>
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
Expand Down Expand Up @@ -196,5 +196,6 @@ 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 = 5
mavenMinorVersion = 65
mavenMinorVersion = 66
mavenPatchVersion = 0
mavenArtifactSuffix =

Expand Down Expand Up @@ -119,5 +119,6 @@ mavenCentralPublishingEnabled=false






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 = "5.65.0";
public static final String VERSION_NAME = "5.66.0";
}


Expand Down Expand Up @@ -96,5 +96,6 @@ private Constants() {






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

/**
* The Requested Access Token Version.
* Specifies the access token version expected by this resource. This changes the version and format of the JWT produced independent of the endpoint or client used to request the access token. The endpoint used, v1.0 or v2.0, is chosen by the client and only impacts the version of id_tokens. Resources need to explicitly configure requestedAccessTokenVersion to indicate the supported access token format. Possible values for requestedAccessTokenVersion are 1, 2, or null. If the value is null, this defaults to 1, which corresponds to the v1.0 endpoint. If signInAudience on the application is configured as AzureADandPersonalMicrosoftAccount, the value for this property must be 2
* Specifies the access token version expected by this resource. This changes the version and format of the JWT produced independent of the endpoint or client used to request the access token. The endpoint used, v1.0 or v2.0, is chosen by the client and only impacts the version of id_tokens. Resources need to explicitly configure requestedAccessTokenVersion to indicate the supported access token format. Possible values for requestedAccessTokenVersion are 1, 2, or null. If the value is null, this defaults to 1, which corresponds to the v1.0 endpoint. If signInAudience on the application is configured as AzureADandPersonalMicrosoftAccount or PersonalMicrosoftAccount, the value for this property must be 2.
*/
@SerializedName(value = "requestedAccessTokenVersion", alternate = {"RequestedAccessTokenVersion"})
@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.ConditionalAccessFilter;


import com.google.gson.JsonObject;
Expand Down Expand Up @@ -38,6 +39,15 @@ public final AdditionalDataManager additionalDataManager() {
return additionalDataManager;
}

/**
* The Application Filter.
*
*/
@SerializedName(value = "applicationFilter", alternate = {"ApplicationFilter"})
@Expose
@Nullable
public ConditionalAccessFilter applicationFilter;

/**
* The Exclude Applications.
* Can be one of the following: The list of client IDs (appId) explicitly excluded from the policy. Office365 - For the list of apps included in Office365, see Conditional Access target apps: Office 365
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.ConditionalAccessFilter;


import com.google.gson.JsonObject;
Expand Down Expand Up @@ -56,6 +57,15 @@ public final AdditionalDataManager additionalDataManager() {
@Nullable
public java.util.List<String> includeServicePrincipals;

/**
* The Service Principal Filter.
*
*/
@SerializedName(value = "servicePrincipalFilter", alternate = {"ServicePrincipalFilter"})
@Expose
@Nullable
public ConditionalAccessFilter servicePrincipalFilter;


/**
* Sets the raw JSON object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Locked Out.
*
* The number of units that are locked out because the customer cancelled their subscription of the service SKU.
*/
@SerializedName(value = "lockedOut", alternate = {"LockedOut"})
@Expose
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/microsoft/graph/models/SubscribedSku.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {

/**
* The Account Id.
*
* The unique ID of the account this SKU belongs to.
*/
@SerializedName(value = "accountId", alternate = {"AccountId"})
@Expose
Expand All @@ -39,7 +39,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {

/**
* The Account Name.
*
* The name of the account this SKU belongs to.
*/
@SerializedName(value = "accountName", alternate = {"AccountName"})
@Expose
Expand All @@ -48,7 +48,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {

/**
* The Applies To.
* For example, 'User' or 'Company'.
* The target class for this SKU. Only SKUs with target class User are assignable. Possible values are: 'User', 'Company'.
*/
@SerializedName(value = "appliesTo", alternate = {"AppliesTo"})
@Expose
Expand All @@ -57,7 +57,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {

/**
* The Capability Status.
* Possible values are: Enabled, Warning, Suspended, Deleted, LockedOut. The capabilityStatus is Enabled if the prepaidUnits property has at least 1 unit that is enabled, and LockedOut if the customer cancelled their subscription.
* Enabled indicates that the prepaidUnits property has at least one unit that is enabled. LockedOut indicates that the customer cancelled their subscription. Possible values are: Enabled, Warning, Suspended, Deleted, LockedOut.
*/
@SerializedName(value = "capabilityStatus", alternate = {"CapabilityStatus"})
@Expose
Expand All @@ -84,7 +84,7 @@ public class SubscribedSku extends Entity implements IJsonBackedObject {

/**
* The Service Plans.
* Information about the service plans that are available with the SKU. Not nullable
* Information about the service plans that are available with the SKU. Not nullable.
*/
@SerializedName(value = "servicePlans", alternate = {"ServicePlans"})
@Expose
Expand Down
47 changes: 47 additions & 0 deletions src/main/java/com/microsoft/graph/models/TeamsAppSettings.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// 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.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 Teams App Settings.
*/
public class TeamsAppSettings extends Entity implements IJsonBackedObject {


/**
* The Allow User Requests For App Access.
*
*/
@SerializedName(value = "allowUserRequestsForAppAccess", alternate = {"AllowUserRequestsForAppAccess"})
@Expose
@Nullable
public Boolean allowUserRequestsForAppAccess;


/**
* 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) {

}
}
10 changes: 10 additions & 0 deletions src/main/java/com/microsoft/graph/models/Teamwork.java
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.TeamsAppSettings;
import com.microsoft.graph.models.Entity;
import com.microsoft.graph.requests.WorkforceIntegrationCollectionPage;
import com.microsoft.graph.requests.DeletedTeamCollectionPage;
Expand Down Expand Up @@ -46,6 +47,15 @@ public class Teamwork extends Entity implements IJsonBackedObject {
@Nullable
public com.microsoft.graph.requests.DeletedTeamCollectionPage deletedTeams;

/**
* The Teams App Settings.
*
*/
@SerializedName(value = "teamsAppSettings", alternate = {"TeamsAppSettings"})
@Expose
@Nullable
public TeamsAppSettings teamsAppSettings;


/**
* Sets the raw JSON object
Expand Down
21 changes: 0 additions & 21 deletions src/main/java/com/microsoft/graph/requests/GraphServiceClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -536,27 +536,6 @@ public com.microsoft.graph.requests.GroupSettingTemplateRequestBuilder groupSett
return new com.microsoft.graph.requests.GroupSettingTemplateRequestBuilder(getServiceRoot() + "/groupSettingTemplates/" + id, this, null);
}

/**
* Gets the collection of Localizations objects
*
* @return the request builder for the collection of Localizations objects
*/
@Nonnull
public com.microsoft.graph.requests.OrganizationalBrandingLocalizationCollectionRequestBuilder localizations() {
return new com.microsoft.graph.requests.OrganizationalBrandingLocalizationCollectionRequestBuilder(getServiceRoot() + "/localizations", this, null);
}

/**
* Gets a single Localizations
*
* @param id the id of the Localizations to retrieve
* @return the request builder for the Localizations object
*/
@Nonnull
public com.microsoft.graph.requests.OrganizationalBrandingLocalizationRequestBuilder localizations(@Nonnull final String id) {
return new com.microsoft.graph.requests.OrganizationalBrandingLocalizationRequestBuilder(getServiceRoot() + "/localizations/" + id, this, null);
}

/**
* Gets the collection of Oauth2PermissionGrants objects
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import com.microsoft.graph.http.IRequestBuilder;
import com.microsoft.graph.core.ClientException;
import com.microsoft.graph.models.OrganizationalBranding;
import com.microsoft.graph.models.OrganizationalBrandingLocalization;
import java.util.Arrays;
import java.util.EnumSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import com.microsoft.graph.http.IRequestBuilder;
import com.microsoft.graph.core.ClientException;
import com.microsoft.graph.models.OrganizationalBranding;
import com.microsoft.graph.models.OrganizationalBrandingLocalization;
import java.util.Arrays;
import java.util.EnumSet;
Expand All @@ -27,7 +28,7 @@
public class OrganizationalBrandingLocalizationCollectionRequestBuilder extends BaseCollectionRequestBuilder<OrganizationalBrandingLocalization, OrganizationalBrandingLocalizationRequestBuilder, OrganizationalBrandingLocalizationCollectionResponse, OrganizationalBrandingLocalizationCollectionPage, OrganizationalBrandingLocalizationCollectionRequest> {

/**
* The request builder for this collection of OrganizationalBrandingLocalization
* The request builder for this collection of OrganizationalBranding
*
* @param requestUrl the request URL
* @param client the service client
Expand Down
Loading

0 comments on commit 34bb276

Please sign in to comment.