Skip to content

Commit

Permalink
Merge pull request #643 from microsoftgraph/beta/pipelinebuild/122273
Browse files Browse the repository at this point in the history
Generated Beta models and request builders
  • Loading branch information
ramsessanchez authored Aug 10, 2023
2 parents 950e00f + 7770279 commit 23f71de
Show file tree
Hide file tree
Showing 296 changed files with 14,394 additions and 339 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

## [0.78.0] - 2023-08-10

### Changed

- Weekly generation.

## [0.77.0] - 2023-07-28

### Changed
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repositories {
dependencies {
// Include the sdk as a dependency
implementation 'com.microsoft.graph:microsoft-graph-beta:0.77.0-SNAPSHOT'
implementation 'com.microsoft.graph:microsoft-graph-beta:0.78.0-SNAPSHOT'
// 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 @@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
<!-- Include the sdk as a dependency -->
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph-beta</artifactId>
<version>0.77.0-SNAPSHOT</version>
<version>0.78.0-SNAPSHOT</version>
</dependency>
<dependency>
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
Expand Down Expand Up @@ -149,3 +149,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
[Third-party notices](THIRD%20PARTY%20NOTICES)



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-beta
mavenMajorVersion = 0
mavenMinorVersion = 77
mavenMinorVersion = 78
mavenPatchVersion = 0
mavenArtifactSuffix =

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






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

/**
* The User Id.
* The unique identifier (GUID) of the user in Azure Active Directory. This and other user info will be null/empty for bot call types (ucap_in, ucap_out).
* The unique identifier (GUID) of the user in Azure Active Directory. This and other user info will be null/empty for bot call types (ucapin, ucapout).
*/
@SerializedName(value = "userId", alternate = {"UserId"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
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.devicemanagement.models.AggregationType;
import com.microsoft.graph.models.KeyValuePair;


import com.google.gson.JsonObject;
Expand Down Expand Up @@ -47,6 +49,15 @@ public final AdditionalDataManager additionalDataManager() {
@Nullable
public AggregationType aggregationType;

/**
* The Alert Impact Details.
* The detail information of the impact. For example, if the Frontline Cloud PCs near concurrency limit alert is triggered, the details contain the impacted Frontline license SKU name, such as Windows 365 Frontline 2 vCPU/8GB/128GB, and the corresponding impacted value.
*/
@SerializedName(value = "alertImpactDetails", alternate = {"AlertImpactDetails"})
@Expose
@Nullable
public java.util.List<KeyValuePair> alertImpactDetails;

/**
* The Value.
* The number value of the impact. For the aggregation types of count and affectedCloudPcCount, the value indicates the number of affected instances. For example, 6 affectedCloudPcCount means that 6 Cloud PCs are affected. For the aggregation types of percentage and affectedCloudPcPercentage, the value indicates the percent of affected instances. For example, 12 affectedCloudPcPercentage means that 12% of Cloud PCs are affected.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class AlertRecord extends Entity implements IJsonBackedObject {

/**
* The Alert Impact.
* The impact of the alert event. Consists of a number followed by the aggregation type. For example, 6 affectedCloudPcCount means that 6 Cloud PCs are affected. 12 affectedCloudPcPercentage means 12% of Cloud PCs are affected.
* The impact of the alert event. Consists of a list of key-value pair and a number followed by the aggregation type. For example, 6 affectedCloudPcCount means that 6 Cloud PCs are affected. 12 affectedCloudPcPercentage means 12% of Cloud PCs are affected. The list of key-value pair indicates the details of the alert impact.
*/
@SerializedName(value = "alertImpact", alternate = {"AlertImpact"})
@Expose
Expand All @@ -49,7 +49,7 @@ public class AlertRecord extends Entity implements IJsonBackedObject {

/**
* The Alert Rule Template.
* The rule template of the alert event. The possible values are: cloudPcProvisionScenario, cloudPcImageUploadScenario, cloudPcOnPremiseNetworkConnectionCheckScenario, unknownFutureValue.
* The rule template of the alert event. The possible values are: cloudPcProvisionScenario, cloudPcImageUploadScenario, cloudPcOnPremiseNetworkConnectionCheckScenario, unknownFutureValue, cloudPcInGracePeriodScenario. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values from this evolvable enum: cloudPcInGracePeriodScenario.
*/
@SerializedName(value = "alertRuleTemplate", alternate = {"AlertRuleTemplate"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class AlertRule extends Entity implements IJsonBackedObject {

/**
* The Alert Rule Template.
* The rule template of the alert event. The possible values are: cloudPcProvisionScenario, cloudPcImageUploadScenario, cloudPcOnPremiseNetworkConnectionCheckScenario, unknownFutureValue.
* The rule template of the alert event. The possible values are: cloudPcProvisionScenario, cloudPcImageUploadScenario, cloudPcOnPremiseNetworkConnectionCheckScenario, unknownFutureValue, cloudPcInGracePeriodScenario. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values from this evolvable enum: cloudPcInGracePeriodScenario.
*/
@SerializedName(value = "alertRuleTemplate", alternate = {"AlertRuleTemplate"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ public enum AlertRuleTemplate
*/
CLOUD_PC_IN_GRACE_PERIOD_SCENARIO,
/**
* cloud Pc Frontline Insufficient Licenses Scenario
*/
CLOUD_PC_FRONTLINE_INSUFFICIENT_LICENSES_SCENARIO,
/**
* For AlertRuleTemplate values that were not expected from the service
*/
UNEXPECTED_VALUE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Alert Rule Template.
* The associated alert rule template. The possible values are: cloudPcProvisionScenario, cloudPcImageUploadScenario, cloudPcOnPremiseNetworkConnectionCheckScenario, unknownFutureValue.
* The associated alert rule template. The possible values are: cloudPcProvisionScenario, cloudPcImageUploadScenario, cloudPcOnPremiseNetworkConnectionCheckScenario, unknownFutureValue, cloudPcInGracePeriodScenario. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values from this evolvable enum: cloudPcInGracePeriodScenario.
*/
@SerializedName(value = "alertRuleTemplate", alternate = {"AlertRuleTemplate"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The EDiscovery Result Templates.
* Enables the developer to define the appearance of the content and configure conditions that dictate when the template should be displayed. Maximum of two eDiscovery result templates per connection.
*
*/
@SerializedName(value = "eDiscoveryResultTemplates", alternate = {"EDiscoveryResultTemplates"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class ExternalConnection extends Entity implements IJsonBackedObject {

/**
* The Compliance Settings.
* The settings required for the connection to participate in eDiscovery, such as the display templates for eDiscovery results.
*
*/
@SerializedName(value = "complianceSettings", alternate = {"ComplianceSettings"})
@Expose
Expand Down Expand Up @@ -84,7 +84,7 @@ public class ExternalConnection extends Entity implements IJsonBackedObject {

/**
* The Enabled Content Experiences.
* The list of content experiences the connection will participate in. Possible values are search and compliance.
* The list of content experiences the connection will participate in. Possible values are search.
*/
@SerializedName(value = "enabledContentExperiences", alternate = {"EnabledContentExperiences"})
@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 = "0.77.0";
public static final String VERSION_NAME = "0.78.0";
}


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






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

/**
* The Attribute Name.
* The name of the attribute in the end system. If the destination is accessPackageUserDirectoryAttributeStore, then a user property such as jobTitle or a directory schema extension for the user object type, such as extension_2b676109c7c74ae2b41549205f1947ed_personalTitle.
* The name of the attribute in the end system. If the destination is accessPackageUserDirectoryAttributeStore, then a user property such as jobTitle or a directory schema extension for the user object type, such as extension2b676109c7c74ae2b41549205f1947edpersonalTitle.
*/
@SerializedName(value = "attributeName", alternate = {"AttributeName"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Data.
* Data that represents the terms of use PDF document. Read-only. Note: You can use the .NET Convert.ToBase64String method to convert your file to binary data for uploading using the Create agreements API. A sample syntax using this method in PowerShell is [convert]::ToBase64String((Get-Content -path 'your_file_path' -Encoding byte)).
* Data that represents the terms of use PDF document. Read-only. Note: You can use the .NET Convert.ToBase64String method to convert your file to binary data for uploading using the Create agreements API. A sample syntax using this method in PowerShell is [convert]::ToBase64String((Get-Content -path 'yourfilepath' -Encoding byte)).
*/
@SerializedName(value = "data", alternate = {"Data"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Template Source: Enum.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;


/**
* The Enum Android Device Owner Delegated App Scope Type.
*/
public enum AndroidDeviceOwnerDelegatedAppScopeType
{
/**
* unspecified
*/
UNSPECIFIED,
/**
* certificate Install
*/
CERTIFICATE_INSTALL,
/**
* capture Network Activity Log
*/
CAPTURE_NETWORK_ACTIVITY_LOG,
/**
* capture Security Log
*/
CAPTURE_SECURITY_LOG,
/**
* unknown Future Value
*/
UNKNOWN_FUTURE_VALUE,
/**
* For AndroidDeviceOwnerDelegatedAppScopeType values that were not expected from the service
*/
UNEXPECTED_VALUE
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
// 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.AppListItem;
import com.microsoft.graph.models.AndroidDeviceOwnerDelegatedAppScopeType;


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 Android Device Owner Delegated Scope App Setting.
*/
public class AndroidDeviceOwnerDelegatedScopeAppSetting 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 App Detail.
* Information about the app like Name, AppStoreUrl, Publisher and AppId
*/
@SerializedName(value = "appDetail", alternate = {"AppDetail"})
@Expose
@Nullable
public AppListItem appDetail;

/**
* The App Scopes.
* List of scopes an app has been assigned.
*/
@SerializedName(value = "appScopes", alternate = {"AppScopes"})
@Expose
@Nullable
public java.util.List<AndroidDeviceOwnerDelegatedAppScopeType> appScopes;


/**
* 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 @@ -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.AndroidDeviceOwnerDelegatedScopeAppSetting;
import com.microsoft.graph.models.AndroidDeviceOwnerAppAutoUpdatePolicyType;
import com.microsoft.graph.models.AndroidDeviceOwnerDefaultAppPermissionPolicyType;
import com.microsoft.graph.models.AppListItem;
Expand Down Expand Up @@ -62,6 +63,15 @@ public class AndroidDeviceOwnerGeneralDeviceConfiguration extends DeviceConfigur
@Nullable
public Boolean accountsBlockModification;

/**
* The Android Device Owner Delegated Scope App Settings.
* Specifies the list of managed apps with app details and its associated delegated scope(s). This collection can contain a maximum of 500 elements.
*/
@SerializedName(value = "androidDeviceOwnerDelegatedScopeAppSettings", alternate = {"AndroidDeviceOwnerDelegatedScopeAppSettings"})
@Expose
@Nullable
public java.util.List<AndroidDeviceOwnerDelegatedScopeAppSetting> androidDeviceOwnerDelegatedScopeAppSettings;

/**
* The Apps Allow Install From Unknown Sources.
* Indicates whether or not the user is allowed to enable to unknown sources setting.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@ public class AndroidDeviceOwnerVpnConfiguration extends VpnConfiguration impleme
@Nullable
public String microsoftTunnelSiteId;

/**
* The Proxy Exclusion List.
* List of hosts to exclude using the proxy on connections for. These hosts can use wildcards such as *.example.com.
*/
@SerializedName(value = "proxyExclusionList", alternate = {"ProxyExclusionList"})
@Expose
@Nullable
public java.util.List<String> proxyExclusionList;

/**
* The Proxy Server.
* Proxy server.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ public class AndroidForWorkGeneralDeviceConfiguration extends DeviceConfiguratio
@Nullable
public java.util.List<String> allowedGoogleAccountDomains;

/**
* The Block Unified Password For Work Profile.
* Prevent using unified password for unlocking device and work profile.
*/
@SerializedName(value = "blockUnifiedPasswordForWorkProfile", alternate = {"BlockUnifiedPasswordForWorkProfile"})
@Expose
@Nullable
public Boolean blockUnifiedPasswordForWorkProfile;

/**
* The Password Block Face Unlock.
* Indicates whether or not to block face unlock.
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/microsoft/graph/models/AndroidLobApp.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.models.AndroidMinimumOperatingSystem;
import com.microsoft.graph.models.AndroidTargetedPlatforms;
import com.microsoft.graph.models.MobileLobApp;


Expand Down Expand Up @@ -62,6 +63,15 @@ public class AndroidLobApp extends MobileLobApp implements IJsonBackedObject {
@Nullable
public String packageId;

/**
* The Targeted Platforms.
* The platforms to which the application can be targeted. If not specified, will defauilt to Android Device Administrator.
*/
@SerializedName(value = "targetedPlatforms", alternate = {"TargetedPlatforms"})
@Expose
@Nullable
public EnumSet<AndroidTargetedPlatforms> targetedPlatforms;

/**
* The Version Code.
* The version code of Android Line of Business (LoB) app.
Expand Down
Loading

0 comments on commit 23f71de

Please sign in to comment.