Skip to content

Commit

Permalink
Merge pull request #534 from microsoftgraph/beta/pipelinebuild/109250
Browse files Browse the repository at this point in the history
Generated Beta models and request builders
  • Loading branch information
andrueastman authored Mar 14, 2023
2 parents d64843c + 2cfb598 commit c40ecaa
Show file tree
Hide file tree
Showing 30 changed files with 559 additions and 39 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.64.0] - 2023-03-14

### Changed

- Weekly generation.

## [0.63.0] - 2023-03-08

### 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.63.0-SNAPSHOT'
implementation 'com.microsoft.graph:microsoft-graph-beta:0.64.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.63.0-SNAPSHOT</version>
<version>0.64.0-SNAPSHOT</version>
</dependency>
<dependency>
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
Expand Down Expand Up @@ -199,5 +199,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-beta
mavenMajorVersion = 0
mavenMinorVersion = 63
mavenMinorVersion = 64
mavenPatchVersion = 0
mavenArtifactSuffix =

Expand Down Expand Up @@ -98,5 +98,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 = "0.63.0";
public static final String VERSION_NAME = "0.64.0";
}


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






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

/**
* The Authentication Strength Result.
*
* The result of the authentication strength. The possible values are: notSet, skippedForProofUp, satisfied, singleChallengeRequired, multipleChallengesRequired, singleRegistrationRequired, multipleRegistrationsRequired, cannotSatisfyDueToCombinationConfiguration, cannotSatisfy, unknownFutureValue.
*/
@SerializedName(value = "authenticationStrengthResult", alternate = {"AuthenticationStrengthResult"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// Template Source: BaseMethodParameterSet.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.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.gson.JsonObject;
import java.util.EnumSet;
import java.util.ArrayList;

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

/**
* The class for the Cloud PCStart Parameter Set.
*/
public class CloudPCStartParameterSet {

/**
* Instiaciates a new CloudPCStartParameterSet
*/
public CloudPCStartParameterSet() {}
/**
* Instiaciates a new CloudPCStartParameterSet
* @param builder builder bearing the parameters to initialize from
*/
protected CloudPCStartParameterSet(@Nonnull final CloudPCStartParameterSetBuilder builder) {
}
/**
* Gets a new builder for the body
* @return a new builder
*/
@Nonnull
public static CloudPCStartParameterSetBuilder newBuilder() {
return new CloudPCStartParameterSetBuilder();
}
/**
* Fluent builder for the CloudPCStartParameterSet
*/
public static final class CloudPCStartParameterSetBuilder {
/**
* Instanciates a new CloudPCStartParameterSetBuilder
*/
@Nullable
protected CloudPCStartParameterSetBuilder(){}
/**
* Buils the resulting body object to be passed to the request
* @return the body object to pass to the request
*/
@Nonnull
public CloudPCStartParameterSet build() {
return new CloudPCStartParameterSet(this);
}
}
/**
* Gets the functions options from the properties that have been set
* @return a list of function options for the request
*/
@Nonnull
public java.util.List<com.microsoft.graph.options.FunctionOption> getFunctionOptions() {
final ArrayList<com.microsoft.graph.options.FunctionOption> result = new ArrayList<>();
return result;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// Template Source: BaseMethodParameterSet.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.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.gson.JsonObject;
import java.util.EnumSet;
import java.util.ArrayList;

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

/**
* The class for the Cloud PCStop Parameter Set.
*/
public class CloudPCStopParameterSet {

/**
* Instiaciates a new CloudPCStopParameterSet
*/
public CloudPCStopParameterSet() {}
/**
* Instiaciates a new CloudPCStopParameterSet
* @param builder builder bearing the parameters to initialize from
*/
protected CloudPCStopParameterSet(@Nonnull final CloudPCStopParameterSetBuilder builder) {
}
/**
* Gets a new builder for the body
* @return a new builder
*/
@Nonnull
public static CloudPCStopParameterSetBuilder newBuilder() {
return new CloudPCStopParameterSetBuilder();
}
/**
* Fluent builder for the CloudPCStopParameterSet
*/
public static final class CloudPCStopParameterSetBuilder {
/**
* Instanciates a new CloudPCStopParameterSetBuilder
*/
@Nullable
protected CloudPCStopParameterSetBuilder(){}
/**
* Buils the resulting body object to be passed to the request
* @return the body object to pass to the request
*/
@Nonnull
public CloudPCStopParameterSet build() {
return new CloudPCStopParameterSet(this);
}
}
/**
* Gets the functions options from the properties that have been set
* @return a list of function options for the request
*/
@Nonnull
public java.util.List<com.microsoft.graph.options.FunctionOption> getFunctionOptions() {
final ArrayList<com.microsoft.graph.options.FunctionOption> result = new ArrayList<>();
return result;
}
}
18 changes: 18 additions & 0 deletions src/main/java/com/microsoft/graph/models/CloudPcLaunchInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,24 @@ public final AdditionalDataManager additionalDataManager() {
@Nullable
public String cloudPcLaunchUrl;

/**
* The Windows365Switch Compatible.
* Indicates whether the Cloud PC supports switch functionality. If the value is true, it supports switch functionality; otherwise, false.
*/
@SerializedName(value = "windows365SwitchCompatible", alternate = {"Windows365SwitchCompatible"})
@Expose
@Nullable
public Boolean windows365SwitchCompatible;

/**
* The Windows365Switch Not Compatible Reason.
* Indicates the reason the Cloud PC doesn't support switch. CPCOsVersionNotMeetRequirement indicates that the user needs to update their Cloud PC operation system version. CPCHardwareNotMeetRequirement indicates that the Cloud PC needs more CPU or RAM to support the functionality.
*/
@SerializedName(value = "windows365SwitchNotCompatibleReason", alternate = {"Windows365SwitchNotCompatibleReason"})
@Expose
@Nullable
public String windows365SwitchNotCompatibleReason;


/**
* Sets the raw JSON object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@ public class CloudPcProvisioningPolicy extends Entity implements IJsonBackedObje
@Nullable
public String cloudPcGroupDisplayName;

/**
* The Cloud Pc Naming Template.
*
*/
@SerializedName(value = "cloudPcNamingTemplate", alternate = {"CloudPcNamingTemplate"})
@Expose
@Nullable
public String cloudPcNamingTemplate;

/**
* The Description.
* The provisioning policy description.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
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.CloudPcManagementAssignmentTarget;
import com.microsoft.graph.models.Entity;
import com.microsoft.graph.requests.UserCollectionPage;


import com.google.gson.JsonObject;
Expand All @@ -35,6 +37,13 @@ public class CloudPcProvisioningPolicyAssignment extends Entity implements IJson
@Nullable
public CloudPcManagementAssignmentTarget target;

/**
* The Assigned Users.
*
*/
@Nullable
public com.microsoft.graph.requests.UserCollectionPage assignedUsers;


/**
* Sets the raw JSON object
Expand All @@ -44,5 +53,9 @@ public class CloudPcProvisioningPolicyAssignment extends Entity implements IJson
*/
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {


if (json.has("assignedUsers")) {
assignedUsers = serializer.deserializeObject(json.get("assignedUsers"), com.microsoft.graph.requests.UserCollectionPage.class);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Rule Satisfied.
* Refers to the conditional access policy conditions that were satisfied. The possible values are: allApps, firstPartyApps, office365, appId, acr, appFilter, allUsers, guest, groupId, roleId, userId, allDevicePlatforms, devicePlatform, allLocations, insideCorpnet, allTrustedLocations, locationId, allDevices, deviceFilter, deviceState, unknownFutureValue, deviceFilterIncludeRuleNotMatched, allDeviceStates, anonymizedIPAddress, unfamiliarFeatures, nationStateIPAddress, realTimeThreatIntelligence, internalGuest, b2bCollaborationGuest, b2bCollaborationMember, b2bDirectConnectUser, otherExternalUser, serviceProvider. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: deviceFilterIncludeRuleNotMatched, allDeviceStates.
* Refers to the conditional access policy conditions that were satisfied. The possible values are: allApps, firstPartyApps, office365, appId, acr, appFilter, allUsers, guest, groupId, roleId, userId, allDevicePlatforms, devicePlatform, allLocations, insideCorpnet, allTrustedLocations, locationId, allDevices, deviceFilter, deviceState, unknownFutureValue, deviceFilterIncludeRuleNotMatched, allDeviceStates, anonymizedIPAddress, unfamiliarFeatures, nationStateIPAddress, realTimeThreatIntelligence, internalGuest, b2bCollaborationGuest, b2bCollaborationMember, b2bDirectConnectUser, otherExternalUser, serviceProvider, microsoftAdminPortals. Note that you must use the Prefer: include-unknown-enum-members request header to get the following values in this evolvable enum: deviceFilterIncludeRuleNotMatched, allDeviceStates, anonymizedIPAddress, unfamiliarFeatures, nationStateIPAddress, realTimeThreatIntelligence, internalGuest, b2bCollaborationGuest, b2bCollaborationMember, b2bDirectConnectUser, otherExternalUser, serviceProvider, microsoftAdminPortals.
*/
@SerializedName(value = "ruleSatisfied", alternate = {"RuleSatisfied"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class DeviceManagementConfigurationChoiceSettingCollectionDefinition exte

/**
* The Maximum Count.
* Maximum number of choices in the collection
* Maximum number of choices in the collection. Valid values 1 to 100
*/
@SerializedName(value = "maximumCount", alternate = {"MaximumCount"})
@Expose
Expand All @@ -36,7 +36,7 @@ public class DeviceManagementConfigurationChoiceSettingCollectionDefinition exte

/**
* The Minimum Count.
* Minimum number of choices in the collection
* Minimum number of choices in the collection. Valid values 1 to 100
*/
@SerializedName(value = "minimumCount", alternate = {"MinimumCount"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class DeviceManagementConfigurationSettingGroupCollectionDefinition exten

/**
* The Maximum Count.
* Maximum number of setting group count in the collection. Valid values 1 to 100
* Maximum number of setting group count in the collection
*/
@SerializedName(value = "maximumCount", alternate = {"MaximumCount"})
@Expose
Expand All @@ -36,7 +36,7 @@ public class DeviceManagementConfigurationSettingGroupCollectionDefinition exten

/**
* The Minimum Count.
* Minimum number of setting group count in the collection. Valid values 1 to 100
* Minimum number of setting group count in the collection
*/
@SerializedName(value = "minimumCount", alternate = {"MinimumCount"})
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class DeviceManagementConfigurationStringSettingValueDefinition extends D

/**
* The Format.
* Pre-defined format of the string. Possible values are: none, email, guid, ip, base64, url, version, xml, date, time, binary, regEx, json, dateTime, surfaceHub, bashScript, unknownFutureValue.
* Pre-defined format of the string. Possible values are: none, email, guid, ip, base64, url, version, xml, date, time, binary, regEx, json, dateTime, surfaceHub.
*/
@SerializedName(value = "format", alternate = {"Format"})
@Expose
Expand All @@ -65,7 +65,7 @@ public class DeviceManagementConfigurationStringSettingValueDefinition extends D

/**
* The Maximum Length.
* Maximum length of string. Valid values 0 to 87516
* Maximum length of string
*/
@SerializedName(value = "maximumLength", alternate = {"MaximumLength"})
@Expose
Expand All @@ -74,7 +74,7 @@ public class DeviceManagementConfigurationStringSettingValueDefinition extends D

/**
* The Minimum Length.
* Minimum length of string. Valid values 0 to 87516
* Minimum length of string
*/
@SerializedName(value = "minimumLength", alternate = {"MinimumLength"})
@Expose
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/microsoft/graph/models/Identity.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Display Name.
* The display name of the identity. This property is read-only.
* The display name of the identity. Note that this might not always be available or up to date. For example, if a user changes their display name, the API might show the new value in a future response, but the items associated with the user won't show up as having changed when using delta.
*/
@SerializedName(value = "displayName", alternate = {"DisplayName"})
@Expose
Expand All @@ -48,7 +48,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Id.
* The identifier of the identity. This property is read-only.
* Unique identifier for the identity.
*/
@SerializedName(value = "id", alternate = {"Id"})
@Expose
Expand Down
Loading

0 comments on commit c40ecaa

Please sign in to comment.