Skip to content

Commit caf565b

Browse files
Merge pull request #306 from microsoftgraph/beta/pipelinebuild/74804
Generated beta models and request builders using Typewriter
2 parents a50ced4 + 5b4548f commit caf565b

File tree

51 files changed

+1239
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1239
-49
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
## [0.48.0] - 2022-05-19
15+
16+
### Added
17+
18+
- CloudPcForensicStorageAccount models and related requests.
19+
- Storage model and related requests.
20+
21+
### Changed
22+
23+
- Updated beta models and request builders generated using Typewriter, based on latest Beta-Metadata.
24+
- Updated models and requests related to the newly added CloudPcForensicsStorageAccount & Storage models, ie: CloudPcSnapshotCollectionRequestBuilder, GraphServiceClient, & ManagedDeviceBulkReprovisionCloudPcRequest.
25+
1426
## [0.47.0] - 2022-05-12
1527

1628
### Added

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
2121
dependencies {
2222
// Include the sdk as a dependency
23-
implementation 'com.microsoft.graph:microsoft-graph-beta:0.47.0-SNAPSHOT'
23+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.48.0-SNAPSHOT'
2424
// Uncomment the line below if you are building an android application
2525
//implementation 'com.google.guava:guava:30.1.1-android'
2626
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
@@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
3737
<!-- Include the sdk as a dependency -->
3838
<groupId>com.microsoft.graph</groupId>
3939
<artifactId>microsoft-graph-beta</artifactId>
40-
<version>0.47.0-SNAPSHOT</version>
40+
<version>0.48.0-SNAPSHOT</version>
4141
</dependency>
4242
<dependency>
4343
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -184,5 +184,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
184184

185185

186186

187+
187188

188189

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ org.gradle.caching=true
2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph-beta
2828
mavenMajorVersion = 0
29-
mavenMinorVersion = 47
29+
mavenMinorVersion = 48
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -83,5 +83,6 @@ mavenCentralPublishingEnabled=false
8383

8484

8585

86+
8687

8788

src/main/java/com/microsoft/graph/externalconnectors/models/ConnectionQuota.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class ConnectionQuota extends Entity implements IJsonBackedObject {
2727

2828
/**
2929
* The Items Remaining.
30-
*
30+
* Returns the minimum number in a range that contains the following data: items remaining in the connection and remaining items at tenant-level. The following equation represents the formula used to calculate the minimum number: min(max capacity in the connection – number of items in the connection, tenant quota – number of items indexed in all connections). If the connection is nonmonetized (preview connector or preview content experience), then it returns the number of remaining items in the connection.
3131
*/
3232
@SerializedName(value = "itemsRemaining", alternate = {"ItemsRemaining"})
3333
@Expose

src/main/java/com/microsoft/graph/externalconnectors/models/ExternalConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class ExternalConnection extends Entity implements IJsonBackedObject {
6666

6767
/**
6868
* The Ingested Items Count.
69-
*
69+
* The number of items ingested into a connection. This value is refreshed every 15 minutes. If the connection state is draft, then ingestedItemsCount will be null.
7070
*/
7171
@SerializedName(value = "ingestedItemsCount", alternate = {"IngestedItemsCount"})
7272
@Expose
@@ -129,7 +129,7 @@ public class ExternalConnection extends Entity implements IJsonBackedObject {
129129

130130
/**
131131
* The Quota.
132-
*
132+
* Read-only. Nullable.
133133
*/
134134
@SerializedName(value = "quota", alternate = {"Quota"})
135135
@Expose

src/main/java/com/microsoft/graph/info/Constants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private Constants() {
1818
/** The client secret to use for unit testing */
1919
public static final String CLIENTSECRET = "clientsecret";
2020
/** The SDK version */
21-
public static final String VERSION_NAME = "0.47.0";
21+
public static final String VERSION_NAME = "0.48.0";
2222
}
2323

2424

@@ -58,5 +58,6 @@ private Constants() {
5858

5959

6060

61+
6162

6263

src/main/java/com/microsoft/graph/models/Application.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
362362

363363
/**
364364
* The Extension Properties.
365-
* Read-only. Nullable.
365+
* Read-only. Nullable. Supports $expand and $filter (eq when counting empty collections).
366366
*/
367367
@SerializedName(value = "extensionProperties", alternate = {"ExtensionProperties"})
368368
@Expose
@@ -371,7 +371,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
371371

372372
/**
373373
* The Federated Identity Credentials.
374-
* Federated identities for applications. This object can only be retrieved on a single GET request (GET /applications/{id}/federatedIdentityCredentials).
374+
* Federated identities for applications. Supports $expand and $filter (eq when counting empty collections).
375375
*/
376376
@SerializedName(value = "federatedIdentityCredentials", alternate = {"FederatedIdentityCredentials"})
377377
@Expose
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Template Source: BaseEntity.java.tt
2+
// ------------------------------------------------------------------------------
3+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
// ------------------------------------------------------------------------------
5+
6+
package com.microsoft.graph.models;
7+
import com.microsoft.graph.serializer.ISerializer;
8+
import com.microsoft.graph.serializer.IJsonBackedObject;
9+
import com.microsoft.graph.serializer.AdditionalDataManager;
10+
import java.util.EnumSet;
11+
import com.microsoft.graph.models.Entity;
12+
13+
14+
import com.google.gson.JsonObject;
15+
import com.google.gson.annotations.SerializedName;
16+
import com.google.gson.annotations.Expose;
17+
import javax.annotation.Nullable;
18+
import javax.annotation.Nonnull;
19+
20+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
21+
22+
/**
23+
* The class for the Cloud Pc Forensic Storage Account.
24+
*/
25+
public class CloudPcForensicStorageAccount extends Entity implements IJsonBackedObject {
26+
27+
28+
/**
29+
* The Storage Account Id.
30+
* The ID of the storage account.
31+
*/
32+
@SerializedName(value = "storageAccountId", alternate = {"StorageAccountId"})
33+
@Expose
34+
@Nullable
35+
public String storageAccountId;
36+
37+
/**
38+
* The Storage Account Name.
39+
* The name of the storage account.
40+
*/
41+
@SerializedName(value = "storageAccountName", alternate = {"StorageAccountName"})
42+
@Expose
43+
@Nullable
44+
public String storageAccountName;
45+
46+
47+
/**
48+
* Sets the raw JSON object
49+
*
50+
* @param serializer the serializer
51+
* @param json the JSON object to set this object to
52+
*/
53+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
54+
55+
}
56+
}
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
// Template Source: BaseMethodParameterSet.java.tt
2+
// ------------------------------------------------------------------------------
3+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
// ------------------------------------------------------------------------------
5+
6+
package com.microsoft.graph.models;
7+
8+
import com.microsoft.graph.models.CloudPcForensicStorageAccount;
9+
import com.google.gson.annotations.Expose;
10+
import com.google.gson.annotations.SerializedName;
11+
import javax.annotation.Nonnull;
12+
import javax.annotation.Nullable;
13+
import com.google.gson.JsonObject;
14+
import java.util.EnumSet;
15+
import java.util.ArrayList;
16+
17+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
18+
19+
/**
20+
* The class for the Cloud Pc Snapshot Get Storage Accounts Parameter Set.
21+
*/
22+
public class CloudPcSnapshotGetStorageAccountsParameterSet {
23+
/**
24+
* The subscription Id.
25+
*
26+
*/
27+
@SerializedName(value = "subscriptionId", alternate = {"SubscriptionId"})
28+
@Expose
29+
@Nullable
30+
public String subscriptionId;
31+
32+
33+
/**
34+
* Instiaciates a new CloudPcSnapshotGetStorageAccountsParameterSet
35+
*/
36+
public CloudPcSnapshotGetStorageAccountsParameterSet() {}
37+
/**
38+
* Instiaciates a new CloudPcSnapshotGetStorageAccountsParameterSet
39+
* @param builder builder bearing the parameters to initialize from
40+
*/
41+
protected CloudPcSnapshotGetStorageAccountsParameterSet(@Nonnull final CloudPcSnapshotGetStorageAccountsParameterSetBuilder builder) {
42+
this.subscriptionId = builder.subscriptionId;
43+
}
44+
/**
45+
* Gets a new builder for the body
46+
* @return a new builder
47+
*/
48+
@Nonnull
49+
public static CloudPcSnapshotGetStorageAccountsParameterSetBuilder newBuilder() {
50+
return new CloudPcSnapshotGetStorageAccountsParameterSetBuilder();
51+
}
52+
/**
53+
* Fluent builder for the CloudPcSnapshotGetStorageAccountsParameterSet
54+
*/
55+
public static final class CloudPcSnapshotGetStorageAccountsParameterSetBuilder {
56+
/**
57+
* The subscriptionId parameter value
58+
*/
59+
@Nullable
60+
protected String subscriptionId;
61+
/**
62+
* Sets the SubscriptionId
63+
* @param val the value to set it to
64+
* @return the current builder object
65+
*/
66+
@Nonnull
67+
public CloudPcSnapshotGetStorageAccountsParameterSetBuilder withSubscriptionId(@Nullable final String val) {
68+
this.subscriptionId = val;
69+
return this;
70+
}
71+
/**
72+
* Instanciates a new CloudPcSnapshotGetStorageAccountsParameterSetBuilder
73+
*/
74+
@Nullable
75+
protected CloudPcSnapshotGetStorageAccountsParameterSetBuilder(){}
76+
/**
77+
* Buils the resulting body object to be passed to the request
78+
* @return the body object to pass to the request
79+
*/
80+
@Nonnull
81+
public CloudPcSnapshotGetStorageAccountsParameterSet build() {
82+
return new CloudPcSnapshotGetStorageAccountsParameterSet(this);
83+
}
84+
}
85+
/**
86+
* Gets the functions options from the properties that have been set
87+
* @return a list of function options for the request
88+
*/
89+
@Nonnull
90+
public java.util.List<com.microsoft.graph.options.FunctionOption> getFunctionOptions() {
91+
final ArrayList<com.microsoft.graph.options.FunctionOption> result = new ArrayList<>();
92+
if(this.subscriptionId != null) {
93+
result.add(new com.microsoft.graph.options.FunctionOption("subscriptionId", subscriptionId));
94+
}
95+
return result;
96+
}
97+
}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
// Template Source: BaseMethodParameterSet.java.tt
2+
// ------------------------------------------------------------------------------
3+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
// ------------------------------------------------------------------------------
5+
6+
package com.microsoft.graph.models;
7+
8+
import com.microsoft.graph.models.CloudPcSubscription;
9+
import com.google.gson.annotations.Expose;
10+
import com.google.gson.annotations.SerializedName;
11+
import javax.annotation.Nonnull;
12+
import javax.annotation.Nullable;
13+
import com.google.gson.JsonObject;
14+
import java.util.EnumSet;
15+
import java.util.ArrayList;
16+
17+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
18+
19+
/**
20+
* The class for the Cloud Pc Snapshot Get Subscriptions Parameter Set.
21+
*/
22+
public class CloudPcSnapshotGetSubscriptionsParameterSet {
23+
24+
/**
25+
* Instiaciates a new CloudPcSnapshotGetSubscriptionsParameterSet
26+
*/
27+
public CloudPcSnapshotGetSubscriptionsParameterSet() {}
28+
/**
29+
* Instiaciates a new CloudPcSnapshotGetSubscriptionsParameterSet
30+
* @param builder builder bearing the parameters to initialize from
31+
*/
32+
protected CloudPcSnapshotGetSubscriptionsParameterSet(@Nonnull final CloudPcSnapshotGetSubscriptionsParameterSetBuilder builder) {
33+
}
34+
/**
35+
* Gets a new builder for the body
36+
* @return a new builder
37+
*/
38+
@Nonnull
39+
public static CloudPcSnapshotGetSubscriptionsParameterSetBuilder newBuilder() {
40+
return new CloudPcSnapshotGetSubscriptionsParameterSetBuilder();
41+
}
42+
/**
43+
* Fluent builder for the CloudPcSnapshotGetSubscriptionsParameterSet
44+
*/
45+
public static final class CloudPcSnapshotGetSubscriptionsParameterSetBuilder {
46+
/**
47+
* Instanciates a new CloudPcSnapshotGetSubscriptionsParameterSetBuilder
48+
*/
49+
@Nullable
50+
protected CloudPcSnapshotGetSubscriptionsParameterSetBuilder(){}
51+
/**
52+
* Buils the resulting body object to be passed to the request
53+
* @return the body object to pass to the request
54+
*/
55+
@Nonnull
56+
public CloudPcSnapshotGetSubscriptionsParameterSet build() {
57+
return new CloudPcSnapshotGetSubscriptionsParameterSet(this);
58+
}
59+
}
60+
/**
61+
* Gets the functions options from the properties that have been set
62+
* @return a list of function options for the request
63+
*/
64+
@Nonnull
65+
public java.util.List<com.microsoft.graph.options.FunctionOption> getFunctionOptions() {
66+
final ArrayList<com.microsoft.graph.options.FunctionOption> result = new ArrayList<>();
67+
return result;
68+
}
69+
}

0 commit comments

Comments
 (0)